Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linux build fixes

Browse Source
This commit is contained in:
Siana Gearz
2012-12-09 04:25:01 +01:00
parent 98ec8b9910
commit 3e5bd4e13b
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloateravatarlist.cpp
View File

@@ -320,10 +320,10 @@ void LLFloaterAvatarList::onClose(bool app_quitting)
} }
} }
void cmd_profile(const LLAvatarListEntry* entry); static void cmd_profile(const LLAvatarListEntry* entry);
void cmd_toggle_mark(LLAvatarListEntry* entry); static void cmd_toggle_mark(LLAvatarListEntry* entry);
void cmd_ar(const LLAvatarListEntry* entry); static void cmd_ar(const LLAvatarListEntry* entry);
void cmd_teleport(const LLAvatarListEntry* entry); static void cmd_teleport(const LLAvatarListEntry* entry);
BOOL LLFloaterAvatarList::postBuild() BOOL LLFloaterAvatarList::postBuild()
{ {
// Set callbacks // Set callbacks
@@ -1447,7 +1447,7 @@ void LLFloaterAvatarList::doCommand(avlist_command_t func, bool single/*=false*/
std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator) std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator)
{ {
std::string ret; std::string ret;
doCommand(boost::bind(&cmd_append_names,_1,ref(ret),separator)); doCommand(boost::bind(&cmd_append_names,_1,boost::ref(ret),separator));
return ret; return ret;
} }

5
indra/newview/llwebprofile.cpp
View File

@@ -39,12 +39,7 @@
#include "llviewermedia.h" // FIXME: don't use LLViewerMedia internals #include "llviewermedia.h" // FIXME: don't use LLViewerMedia internals
// third-party JSONCPP // third-party JSONCPP
#if !defined(LL_STANDALONE) && defined(LINUX64)
// The prebuilt linux64 package is packaged wrongly.
#include <jsoncpp/reader.h> // JSONCPP
#else
#include <json/reader.h> // JSONCPP #include <json/reader.h> // JSONCPP
#endif
/* /*
* Workflow: * Workflow:

4
install.xml
View File

@@ -729,9 +729,9 @@
<key>linux64</key> <key>linux64</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>a06ab38628ab7b53b8f3326cd942a6a8</string> <string>4f87662add231b9d4b6c1e5c63560db4</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux64-20090922.tar.bz2</uri> <uri>https://github.com/downloads/siana/SingularityViewer/jsoncpp-0.5.0-linux64-20121208.tar.bz2</uri>
</map> </map>
<key>windows</key> <key>windows</key>
<map> <map>