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

Client list debugsetting

Browse Source
This commit is contained in:
Siana Gearz
2011-02-27 15:42:19 +01:00
parent ba45b41c03
commit c8602110e4
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/app_settings/settings.xml
View File

@@ -9,6 +9,18 @@
<string>settings_rlv.xml</string> <string>settings_rlv.xml</string>
</array> </array>
<key>ClientDefinitionsURL</key>
<map>
<key>Comment</key>
<string>Where to fetch updated client definitions from</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://app.singularityviewer.org/client_definitions.xml</string>
</map>
<key>LastSelectedGrid</key> <key>LastSelectedGrid</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

9
indra/newview/llvoavatar.cpp
View File

@@ -3333,8 +3333,9 @@ void LLVOAvatar::idleUpdateWindEffect()
bool LLVOAvatar::updateClientTags() bool LLVOAvatar::updateClientTags()
{ {
std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_definitions.xml"); std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_tags_sg1.xml");
LLSD response = LLHTTPClient::blockingGet("http://46.4.144.79/client_definitions.xml"); std::string client_list_url = gSavedSettings.getString("ClientDefinitionsURL");
LLSD response = LLHTTPClient::blockingGet(client_list_url);
if(response.has("body")) if(response.has("body"))
{ {
const LLSD &client_list = response["body"]; const LLSD &client_list = response["body"];
@@ -3354,11 +3355,11 @@ bool LLVOAvatar::updateClientTags()
bool LLVOAvatar::loadClientTags() bool LLVOAvatar::loadClientTags()
{ {
//Changed the file name to keep Emerald from overwriting it. Hokey stuff in there, and it's missing clients. -HGB //Changed the file name to keep Emerald from overwriting it. Hokey stuff in there, and it's missing clients. -HGB
std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_definitions.xml"); std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_tags_sg1.xml");
if(!LLFile::isfile(client_list_filename)) if(!LLFile::isfile(client_list_filename))
{ {
client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "client_definitions.xml"); client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "client_tags_sg1.xml");
} }
if(LLFile::isfile(client_list_filename)) if(LLFile::isfile(client_list_filename))