On Пятница 27 марта 2009 21:26:08 Gareth Nelson wrote: > Please note - don't include [email protected] in your replies, I > don't think LL's licensing team needs every single post on this list > forwarded to them ;) Whoops. Bad habit of always hitting 'a'. My apologies ^_^;;
On Пятница 27 марта 2009 21:39:54 Gareth Nelson wrote: > Then there's a problem there :) Well, I built it, and it fails to log in. Says: Login failed. The Version you are using is either out of date or incorrect. Please visit http://openlifegrid.com to download and install the latest Viewer. This one identifies itself as: (Openlife R16) 1.16.3 (84). The version available for download is: http://dl1.3dxviewer.com/3DXViewer/OpenLife R16_3_Linux-i686(R4).tar.lzma Now what's left to figure out is: is it doing a MD5 check against the built binary (fine according to GPL2, and easily worked around), or is there anything in the login process that's not included in the release (which would not be ok) Quick and dirty patch to get it to build attached. With this it should build fine on Ubuntu Intrepid at least. Additional instructions for Linux: rename the source folder to one without spaces in it. The packaging stage doesn't like it. chmod +x develop.py dos2unix develop.py dos2unix newview/app_settings/*.ini
diff -r -u 3DXviewer_R16_Series_Source_orig/indra/llmedia/llmediamanager.cpp 3DXviewer_R16_Series_Source/indra/llmedia/llmediamanager.cpp
--- 3DXviewer_R16_Series_Source_orig/indra/llmedia/llmediamanager.cpp 2009-02-08 17:29:36.000000000 +0300
+++ 3DXviewer_R16_Series_Source/indra/llmedia/llmediamanager.cpp 2009-03-27 22:58:01.000000000 +0300
@@ -151,7 +151,9 @@
void LLMediaManager::setBrowserUserAgent(std::string user_agent)
{
// *HACK: Breaks encapsulation model, as initClass does above. JC
+#if LL_LLMOZLIB_ENABLED
LLMediaImplLLMozLib::setBrowserUserAgent(user_agent);
+#endif
}
////////////////////////////////////////////////////////////////////////////////
diff -r -u 3DXviewer_R16_Series_Source_orig/indra/llrender/llrender.h 3DXviewer_R16_Series_Source/indra/llrender/llrender.h
--- 3DXviewer_R16_Series_Source_orig/indra/llrender/llrender.h 2009-02-08 17:30:06.000000000 +0300
+++ 3DXviewer_R16_Series_Source/indra/llrender/llrender.h 2009-03-27 23:00:01.000000000 +0300
@@ -214,7 +214,7 @@
LLTexUnit* getTexUnit(U32 index);
- typedef struct Vertex
+ struct Vertex
{
GLfloat v[3];
GLubyte c[4];
diff -r -u 3DXviewer_R16_Series_Source_orig/indra/llwindow/llwindowsdl.cpp 3DXviewer_R16_Series_Source/indra/llwindow/llwindowsdl.cpp
--- 3DXviewer_R16_Series_Source_orig/indra/llwindow/llwindowsdl.cpp 2009-02-08 17:30:04.000000000 +0300
+++ 3DXviewer_R16_Series_Source/indra/llwindow/llwindowsdl.cpp 2009-03-28 00:10:44.000000000 +0300
@@ -2530,7 +2530,7 @@
buttons = GTK_BUTTONS_YES_NO;
break;
}
- win = gtk_message_dialog_new(NULL,flags, "%s",messagetype, buttons, text.c_str());
+ win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, "%s", text.c_str());
# if LL_X11
// Make GTK tell the window manager to associate this
diff -r -u 3DXviewer_R16_Series_Source_orig/indra/lscript/lscript_compile/lscript_tree.cpp 3DXviewer_R16_Series_Source/indra/lscript/lscript_compile/lscript_tree.cpp
--- 3DXviewer_R16_Series_Source_orig/indra/lscript/lscript_compile/lscript_tree.cpp 2009-02-08 17:29:54.000000000 +0300
+++ 3DXviewer_R16_Series_Source/indra/lscript/lscript_compile/lscript_tree.cpp 2009-03-27 23:12:53.000000000 +0300
@@ -7885,13 +7885,13 @@
{
// Prefix function name with g to distinguish from
// event handlers.
- fprintf(fp, gScriptp->getClassName());
+ fprintf(fp, "%s", gScriptp->getClassName());
fprintf(fp, "::'g");
}
- fprintf(fp, mIdentifier->mName);
- fprintf(fp, "'(");
+ fprintf(fp, "%s", mIdentifier->mName);
+ fprintf(fp, "%s", "'(");
print_cil_arg_list(fp, mIdentifier->mScopeEntry->mFunctionArgs);
- fprintf(fp, ")\n");
+ fprintf(fp, "%s", ")\n");
}
break;
default:
@@ -9720,17 +9720,17 @@
// Allows state changing by finding handlers prefixed with new
// state name. Prefix disambiguates functions and event handlers.
fprintf(fp, "e");
- fprintf(fp, entry->mIdentifier);
+ fprintf(fp, "%s", entry->mIdentifier);
// Handler name and arguments.
mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
// Method signature postfix.
- fprintf(fp, " cil managed\n");
+ fprintf(fp, "%s", " cil managed\n");
// Function header.
- fprintf(fp,"{\n");
- fprintf(fp, ".maxstack 500\n"); // TODO: Calculated stack size...
+ fprintf(fp, "%s", "{\n");
+ fprintf(fp, "%s", ".maxstack 500\n"); // TODO: Calculated stack size...
// Allocate space for locals.
print_cil_local_init(fp, mScopeEntry);
@@ -9745,9 +9745,9 @@
if (mbNeedTrailingReturn)
{
// TODO: throw exception?
- fprintf(fp, "ret\n");
+ fprintf(fp, "%s", "ret\n");
}
- fprintf(fp, "}\n");
+ fprintf(fp, "%s", "}\n");
break;
default:
@@ -10152,7 +10152,7 @@
fprintf(fp, ".method public hidebysig instance default ");
print_cil_type(fp, mType ? mType->mType : LST_NULL);
fprintf(fp, " 'g");
- fprintf(fp, mIdentifier->mName);
+ fprintf(fp, "%s", mIdentifier->mName);
fprintf(fp, "'");
if (mParameters)
{
Только в 3DXviewer_R16_Series_Source/indra/newview/linux_tools: client-readme-voice.txt
diff -r -u 3DXviewer_R16_Series_Source_orig/indra/newview/llfloaterassetbrowser.cpp 3DXviewer_R16_Series_Source/indra/newview/llfloaterassetbrowser.cpp
--- 3DXviewer_R16_Series_Source_orig/indra/newview/llfloaterassetbrowser.cpp 2009-02-08 17:29:08.000000000 +0300
+++ 3DXviewer_R16_Series_Source/indra/newview/llfloaterassetbrowser.cpp 2009-03-28 00:06:43.000000000 +0300
@@ -147,7 +147,7 @@
temp.mUUID = itemp->getUUID();
temp.mName = itemp->getName();
temp.mTexturep = NULL;
- temp.mAssetRect = NULL;
+ //temp.mAssetRect = NULL;
mTextureAssets.push_back(temp);
}
@@ -488,4 +488,4 @@
self->createThumbnails();
self->clearNoAssetsText();
self->clearAssetInfoTexts();
-}
\ В конце файла нет новой строки
+}
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/SLDev Please read the policies before posting to keep unmoderated posting privileges
