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

WLF panel - Fixed.

Browse Source 
Colors updating when Friends option is turned on/off - Fixed.
Client tag definitions can now theoretically be retrieved from "http://ascent.balseraph.org/updates/client_definitions.xml"

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-04 18:44:02 -04:00
parent 4a3123b230
commit 26af7e436c
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -605,7 +605,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>1</integer>
</map> </map>
<key>WoLfVerticalIMTabs</key> <key>WoLfVerticalIMTabs</key>
<map> <map>

17
indra/newview/ascentprefsvan.cpp
View File

@@ -83,6 +83,7 @@ LLPrefsAscentVanImpl::LLPrefsAscentVanImpl()
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml"); LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml");
childSetCommitCallback("use_account_settings_check", onCommitCheckBox, this); childSetCommitCallback("use_account_settings_check", onCommitCheckBox, this);
childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this); childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this);
childSetCommitCallback("show_friend_tag_check", onCommitCheckBox, this);
childSetCommitCallback("custom_tag_color_swatch", onCommitColor, this); childSetCommitCallback("custom_tag_color_swatch", onCommitColor, this);
childSetCommitCallback("effect_color_swatch", onCommitColor, this); childSetCommitCallback("effect_color_swatch", onCommitColor, this);
@@ -137,12 +138,26 @@ void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
{ {
self->refresh(); self->refresh();
} }
if (ctrl->getName() == "show_friend_tag_check")
{
for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
iter != LLCharacter::sInstances.end(); ++iter)
{
LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
if(avatarp)
{
LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition();
avatarp->mClientTag = "";
}
}
}
BOOL showCustomOptions; BOOL showCustomOptions;
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag"); showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag");
else else
showCustomOptions = gSavedPerAccountSettings.getBOOL("AscentUseCustomTag"); showCustomOptions = gSavedPerAccountSettings.getBOOL("AscentUseCustomTag");
self->childSetValue("customize_own_tag_check", showCustomOptions); self->childSetValue("customize_own_tag_check", showCustomOptions);
self->childSetEnabled("custom_tag_label_text", showCustomOptions); self->childSetEnabled("custom_tag_label_text", showCustomOptions);
self->childSetEnabled("custom_tag_label_box", showCustomOptions); self->childSetEnabled("custom_tag_label_box", showCustomOptions);

2
indra/newview/llstartup.cpp
View File

@@ -2575,6 +2575,8 @@ bool idle_startup()
// object is created. I think this must be done after setting the region. JC // object is created. I think this must be done after setting the region. JC
gAgent.setPositionAgent(agent_start_position_region); gAgent.setPositionAgent(agent_start_position_region);
wlfPanel_AdvSettings::fixPanel();
display_startup(); display_startup();
LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT ); LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT );
return FALSE; return FALSE;

13
indra/newview/llvoavatar.cpp
View File

@@ -3244,9 +3244,9 @@ void LLVOAvatar::idleUpdateWindEffect()
} }
bool LLVOAvatar::updateClientTags() bool LLVOAvatar::updateClientTags()
{/* Won't do anything for now, we don't have a definitions site set up. -HGB {
std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_list.xml"); std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_definitions.xml");
LLSD response = LLHTTPClient::blockingGet("http://www.destructivelabs.net/remote/tags/client_list.xml"); LLSD response = LLHTTPClient::blockingGet("http://ascent.balseraph.org/updates/client_definitions.xml");
if(response.has("body")) if(response.has("body"))
{ {
const LLSD &client_list = response["body"]; const LLSD &client_list = response["body"];
@@ -3259,7 +3259,7 @@ bool LLVOAvatar::updateClientTags()
export_file.close(); export_file.close();
return true; return true;
} }
}*/ }
return false; return false;
} }
@@ -3384,7 +3384,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
&& getTEImage(TEX_LOWER_BODYPAINT)->getID().asString() == "4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6") && getTEImage(TEX_LOWER_BODYPAINT)->getID().asString() == "4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6")
{ {
color = gColors.getColor( "AvatarNameColor" ); color = gColors.getColor( "AvatarNameColor" );
//client = "??"; client = "?";
} }
return; return;
} }
@@ -3419,6 +3419,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
{ {
color = gColors.getColor( "AvatarNameColor" ); color = gColors.getColor( "AvatarNameColor" );
color.setAlpha(1.f); color.setAlpha(1.f);
client = "?";
//llinfos << "Apparently this tag isn't registered: " << uuid_str << llendl; //llinfos << "Apparently this tag isn't registered: " << uuid_str << llendl;
} }
@@ -3704,7 +3705,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
if (client.length() || is_away || is_muted || is_busy) if (client.length() || is_away || is_muted || is_busy)
{ {
if (client != "") if ((client != "")&&(client != "?"))
{ {
if ((!mIsSelf)||(gSavedSettings.getBOOL("AscentShowSelfTag"))) if ((!mIsSelf)||(gSavedSettings.getBOOL("AscentShowSelfTag")))
{ {