From 59ecef5a9707c1475712d89501cd512b04dbd9fd Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Thu, 9 Jun 2011 23:47:03 +0300
Subject: Fix #924: default RunMultipleThreads to TRUE.
This should work around the 5% FPS slowdown caused by #614 and is
generally a good idea (unless it causes problems, in which case it's
definetely a bad idea).
---
linden/indra/newview/app_settings/settings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e571988..41b9fcf 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -10580,7 +10580,7 @@
Type
Boolean
Value
- 0
+ 1
SafeMode
--
cgit v1.1
From 1a1700a2da16be0f85eb8c859e5714d64f645755 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 12 Jun 2011 16:56:58 -0500
Subject: Commented out "Cut" from menu_inventory.xml. See IMP-961.
---
linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 86dc5c7..0cbd7c6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -166,10 +166,12 @@
+ Grid:
+
+
- Grid:
-
-
@@ -155,23 +163,15 @@
ImprudenceTagColor
-
- Comment
- Color of Imprudence tags (displayed only locally)
- Persist
- 1
- Type
- Color4
- Value
-
- 0.79
- 0.44
- 0.88
- 1
-
-
ShowClientColor
Comment
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
index 0b4caf5..7d69eaf 100644
--- a/linden/indra/newview/llprefscolors.cpp
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -82,10 +82,6 @@ BOOL LLPrefsColors::postBuild()
getChild("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor"));
- getChild("client_tag_color")->set(gSavedSettings.getColor4("ImprudenceTagColor"));
- static BOOL* sShowClientColor = rebind_llcontrol("ShowClientColor", &gSavedSettings, true);
- childSetValue("client_name_color_check", (*sShowClientColor));
-
return TRUE;
}
@@ -103,7 +99,6 @@ void LLPrefsColors::refreshColors()
mFriendsChatColor = gSavedSettings.getColor4("FriendsChatColor");
mOwnNameChatColor = gSavedSettings.getColor4("OwnNameChatColor");
mEffectColor = gSavedSettings.getColor4("EffectColor");
- mClientTagColor = gSavedSettings.getColor4("ImprudenceTagColor");
}
// static
@@ -135,18 +130,6 @@ void LLPrefsColors::updateFriendsCheck()
getChild("FriendsChatColor")->setEnabled(childGetValue("HighlightFriendsChat"));
}
-// static
-void LLPrefsColors::onCommitCheckClient(LLUICtrl* ctrl, void* userdata)
-{
- LLPrefsColors* self = (LLPrefsColors*)userdata;
- self->updateClientCheck();
-}
-
-void LLPrefsColors::updateClientCheck()
-{
- getChild("client_tag_color")->setEnabled(childGetValue("client_name_color_checkt"));
-}
-
void LLPrefsColors::cancel()
{
gSavedSettings.setColor4("SystemChatColor", mSystemChatColor);
@@ -161,7 +144,6 @@ void LLPrefsColors::cancel()
gSavedSettings.setColor4("FriendsChatColor", mFriendsChatColor);
gSavedSettings.setColor4("OwnNameChatColor", mOwnNameChatColor);
gSavedSettings.setColor4("EffectColor", mEffectColor);
- gSavedSettings.setColor4("ImprudenceTagColor", mClientTagColor);
}
void LLPrefsColors::apply()
@@ -198,8 +180,5 @@ void LLPrefsColors::apply()
gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
- gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_name_color_check"));
- gSavedSettings.setColor4("ImprudenceTagColor", getChild("client_tag_color")->get());
-
refreshColors(); // member values become the official values and cancel becomes a no-op.
}
diff --git a/linden/indra/newview/llprefscolors.h b/linden/indra/newview/llprefscolors.h
index d580add..88ea371 100644
--- a/linden/indra/newview/llprefscolors.h
+++ b/linden/indra/newview/llprefscolors.h
@@ -47,11 +47,9 @@ public:
private:
static void onCommitCheckSelfName(LLUICtrl* ctrl, void* userdata);
static void onCommitCheckFriends(LLUICtrl* ctrl, void* userdata);
- static void onCommitCheckClient(LLUICtrl* ctrl, void* userdata);
void refreshColors();
void updateFriendsCheck();
void updateSelfCheck();
- void updateClientCheck();
LLColor4 mSystemChatColor;
LLColor4 mUserChatColor;
@@ -65,7 +63,6 @@ private:
LLColor4 mFriendsChatColor;
LLColor4 mOwnNameChatColor;
LLColor4 mEffectColor;
- LLColor4 mClientTagColor;
};
#endif //LLPREFSCOLORS_H
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 11f4857..596e39c 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3267,18 +3267,8 @@ bool LLVOAvatar::loadClientTags()
void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar)
{
LLUUID idx = avatar->getTE(0)->getID();
-
- // We start locally with Imprudence in case the user has a local color they prefer.
- // This means clientside colors for Imp will always override any on the website.
- // If you're going to add a new color, a new UUID needs to be added -- MC
- if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
- {
- // defaults to LLColor4(0.79f,0.44f,0.88f)
- avatar_name_color = gSavedSettings.getColor4("ImprudenceTagColor"); //Imprudence
- client = "Imprudence";
- }
- else if (LLVOAvatar::sClientResolutionList.has("isComplete") &&
- LLVOAvatar::sClientResolutionList.has(idx.asString()))
+ if(LLVOAvatar::sClientResolutionList.has("isComplete")
+ && LLVOAvatar::sClientResolutionList.has(idx.asString()))
{
LLSD cllsd = LLVOAvatar::sClientResolutionList[idx.asString()];
client = cllsd["name"].asString();
@@ -3287,193 +3277,186 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
avatar_name_color += colour;
avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f);
}
- else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") ||
+ else
+ {
+
+ if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
+ {
+ avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence
+ client = "Imprudence";
+
+ }else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") ||
idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4"))
- {
- avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat
- avatar_name_color = avatar_name_color * (F32)0.333333333333;
- client = "Meerkat";
- }
- else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
- {
- avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7
- client = "Meta7";
- }
- else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))
- {
- avatar_name_color += LLColor4::green;//emerald
- avatar_name_color += LLColor4::green;
- avatar_name_color = avatar_name_color * (F32)0.333333333333;
- client = "Emerald";
- }
- else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))
- {
- avatar_name_color += LLColor4::red;//vlife jcool410
- avatar_name_color = avatar_name_color * 0.5;
- client = "VLife";
- }
- else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))
- {
- avatar_name_color += LLColor4::pink;//tyk3n
- avatar_name_color = avatar_name_color * 0.5;
- client = "tyk3n";
- }
- else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") ||
- idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))
- {
- avatar_name_color += (LLColor4::purple);//psl
- avatar_name_color = avatar_name_color * 0.5;
- client = "PSL";
- }
- else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))
- {
- avatar_name_color += LLColor4::red;//lordgreg
- avatar_name_color += LLColor4::red;
- avatar_name_color = avatar_name_color * (F32)0.333333333333;
- client = "LGG proxy";
- }
- else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))
- {
- avatar_name_color += LLColor4::blue;//day oh
- avatar_name_color = avatar_name_color * 0.5;
- client = "Day Oh proxy";
- }
- else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") ||
- idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") ||
- idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") ||
- idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea"))
- {
- avatar_name_color += LLColor4::cyan;//cryolife
- avatar_name_color += LLColor4::cyan;
- avatar_name_color = avatar_name_color * 0.5;
- client = "CryoLife";
- }
- else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))
- {
- avatar_name_color += LLColor4::pink;//moy
- avatar_name_color += LLColor4::pink;//moy
- avatar_name_color = avatar_name_color * (F32)0.333333333333;
- client = "MoyMix";
- }
- else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") ||
- idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58"))
- {
- avatar_name_color += LLColor4::yellow;//neil
- avatar_name_color += LLColor4::yellow;//neil
- avatar_name_color = avatar_name_color * (F32)0.333333333333;
- client = "NeilLife";
- }
- else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))
- {
- avatar_name_color += LLColor4(0.0f,1.0f,1.0f);
- avatar_name_color = avatar_name_color * 0.5;//phox
- client = "PhoxSL";
- }
- else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014"))
- {
- avatar_name_color += LLColor4::white;
- avatar_name_color += LLColor4::white;
- avatar_name_color = avatar_name_color * (F32)0.333333333333;
- client = "Kung Fu";
- }
- else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))
- {
- avatar_name_color += LLColor4::magenta;
- avatar_name_color += LLColor4::magenta;
- avatar_name_color = avatar_name_color * (F32)0.333333333333;
- client = "BetaLife";
- }
- else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
- {
- avatar_name_color += LLColor4::green;//SimFed Poland
- avatar_name_color += LLColor4::blue;//SimFed Poland
- avatar_name_color += LLColor4::blue;//SimFed Poland
- avatar_name_color = avatar_name_color * 0.5;
- client = "Copybotter";
- }
- else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
- idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat.
- idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat.
- idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat
- idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.-
- {
- avatar_name_color += LLColor4(0.0f,0.5f,1.0f);
- avatar_name_color = avatar_name_color * 0.5;
- client = "VerticalLife";
- }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
- {
- avatar_name_color += LLColor4::blue; //Sapphire
- avatar_name_color += LLColor4::blue; //Sapphire
- avatar_name_color = avatar_name_color * (F32)0.333333333333;
- client = "Sapphire";
- }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))
- {
- avatar_name_color += LLColor4::orange; //corgiVision
- avatar_name_color = avatar_name_color * (F32)0.75;
- client = "Corgi";
- }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))
- {
- avatar_name_color += LLColor4::red; //Ruby
- avatar_name_color += LLColor4::purple; //Ruby
- avatar_name_color = avatar_name_color * (F32)0.333333333333;
- client = "Ruby";
- }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))
- {
- avatar_name_color += LLColor4::yellow9;
- avatar_name_color += LLColor4::yellow9;
- avatar_name_color *= (F32)0.333333333333;
- client = "Gemini";
- }
- else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702"))
- {
- avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
- client = "Operator";
- }
- else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056"))
- {
- avatar_name_color = LLColor4(2.0f,2.0f,2.0f);
- avatar_name_color *= 0.33f;
- client = "iLife";
- }
- else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5"))
- {
- avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
- client = "Gemini.Bot";
- }
- else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1"))
- {
- avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
- client = "Infinity";
- }
- else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37"))
- {
- avatar_name_color = LLColor4(0.0f,0.6f,0.0f);
- avatar_name_color *= 0.33f;
- client = "rivlife";
- }
- else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee"))
- {
- avatar_name_color = LLColor4(0.69f,0.8f,1.6f);
- avatar_name_color *= 0.5f;
- client = "Anti-Life";
- }
- else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") ||
- idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc"))
- {
- avatar_name_color = LLColor4(0.4f,0.4f,0.4f);
- client = "Onyx";
- }
- else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc"))
- {
- avatar_name_color = LLColor4(1.0f,0.61176f,0.0f);
- client = "Whale";
- }
- else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb"))
- {
- avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
- client = "nolife";
+ {
+ avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat
+ avatar_name_color = avatar_name_color * (F32)0.333333333333;
+ client = "Meerkat";
+ }else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
+ {
+ avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7
+ client = "Meta7";
+ }else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))
+ {
+ avatar_name_color += LLColor4::green;//emerald
+ avatar_name_color += LLColor4::green;
+ avatar_name_color = avatar_name_color * (F32)0.333333333333;
+ client = "Emerald";
+ }else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))
+ {
+ avatar_name_color += LLColor4::red;//vlife jcool410
+ avatar_name_color = avatar_name_color * 0.5;
+ client = "VLife";
+ }else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))
+ {
+ avatar_name_color += LLColor4::pink;//tyk3n
+ avatar_name_color = avatar_name_color * 0.5;
+ client = "tyk3n";
+ }else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") ||
+ idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))
+ {
+ avatar_name_color += (LLColor4::purple);//psl
+ avatar_name_color = avatar_name_color * 0.5;
+ client = "PSL";
+ }else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))
+ {
+ avatar_name_color += LLColor4::red;//lordgreg
+ avatar_name_color += LLColor4::red;
+ avatar_name_color = avatar_name_color * (F32)0.333333333333;
+ client = "LGG proxy";
+ }else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))
+ {
+ avatar_name_color += LLColor4::blue;//day oh
+ avatar_name_color = avatar_name_color * 0.5;
+ client = "Day Oh proxy";
+ }else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") ||
+ idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") ||
+ idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") ||
+ idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea"))
+ {
+ avatar_name_color += LLColor4::cyan;//cryolife
+ avatar_name_color += LLColor4::cyan;
+ avatar_name_color = avatar_name_color * 0.5;
+ client = "CryoLife";
+ }else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))
+ {
+ avatar_name_color += LLColor4::pink;//moy
+ avatar_name_color += LLColor4::pink;//moy
+ avatar_name_color = avatar_name_color * (F32)0.333333333333;
+ client = "MoyMix";
+ }else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") ||
+ idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58"))
+ {
+ avatar_name_color += LLColor4::yellow;//neil
+ avatar_name_color += LLColor4::yellow;//neil
+ avatar_name_color = avatar_name_color * (F32)0.333333333333;
+ client = "NeilLife";
+ }else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))
+ {
+ avatar_name_color += LLColor4(0.0f,1.0f,1.0f);
+ avatar_name_color = avatar_name_color * 0.5;//phox
+ client = "PhoxSL";
+ }else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014"))
+ {
+ avatar_name_color += LLColor4::white;
+ avatar_name_color += LLColor4::white;
+ avatar_name_color = avatar_name_color * (F32)0.333333333333;
+ client = "Kung Fu";
+ }else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))
+ {
+ avatar_name_color += LLColor4::magenta;
+ avatar_name_color += LLColor4::magenta;
+ avatar_name_color = avatar_name_color * (F32)0.333333333333;
+ client = "BetaLife";
+ }else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
+ {
+ avatar_name_color += LLColor4::green;//SimFed Poland
+ avatar_name_color += LLColor4::blue;//SimFed Poland
+ avatar_name_color += LLColor4::blue;//SimFed Poland
+ avatar_name_color = avatar_name_color * 0.5;
+ client = "Copybotter";
+ }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
+ idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat.
+ idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat.
+ idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat
+ idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.-
+ {
+ avatar_name_color += LLColor4(0.0f,0.5f,1.0f);
+ avatar_name_color = avatar_name_color * 0.5;
+ client = "VerticalLife";
+ }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
+ {
+ avatar_name_color += LLColor4::blue; //Sapphire
+ avatar_name_color += LLColor4::blue; //Sapphire
+ avatar_name_color = avatar_name_color * (F32)0.333333333333;
+ client = "Sapphire";
+ }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))
+ {
+ avatar_name_color += LLColor4::orange; //corgiVision
+ avatar_name_color = avatar_name_color * (F32)0.75;
+ client = "Corgi";
+ }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))
+ {
+ avatar_name_color += LLColor4::red; //Ruby
+ avatar_name_color += LLColor4::purple; //Ruby
+ avatar_name_color = avatar_name_color * (F32)0.333333333333;
+ client = "Ruby";
+ }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))
+ {
+ avatar_name_color += LLColor4::yellow9;
+ avatar_name_color += LLColor4::yellow9;
+ avatar_name_color *= (F32)0.333333333333;
+ client = "Gemini";
+ }
+ else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702"))
+ {
+ avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
+ client = "Operator";
+ }
+ else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056"))
+ {
+ avatar_name_color = LLColor4(2.0f,2.0f,2.0f);
+ avatar_name_color *= 0.33f;
+ client = "iLife";
+ }
+ else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5"))
+ {
+ avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
+ client = "Gemini.Bot";
+ }
+ else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1"))
+ {
+ avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
+ client = "Infinity";
+ }
+ else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37"))
+ {
+ avatar_name_color = LLColor4(0.0f,0.6f,0.0f);
+ avatar_name_color *= 0.33f;
+ client = "rivlife";
+ }
+ else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee"))
+ {
+ avatar_name_color = LLColor4(0.69f,0.8f,1.6f);
+ avatar_name_color *= 0.5f;
+ client = "Anti-Life";
+ }
+ else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") ||
+ idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc"))
+ {
+ avatar_name_color = LLColor4(0.4f,0.4f,0.4f);
+ client = "Onyx";
+ }
+ else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc"))
+ {
+ avatar_name_color = LLColor4(1.0f,0.61176f,0.0f);
+ client = "Whale";
+ }
+ else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb"))
+ {
+ avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
+ client = "nolife";
+ }
}
-
if(client.empty())
{
LLPointer image_point = gImageList.getImage(idx, MIPMAP_YES, IMMEDIATE_NO);
@@ -3623,7 +3606,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
else
{
// Set your own name to the Imprudence color -- MC
- client_color = gSavedSettings.getColor4("ImprudenceTagColor");
+ client_color = LLColor4(0.79f,0.44f,0.88f);
}
static BOOL* sShowClientColor = rebind_llcontrol("ShowClientColor", &gSavedSettings, true);
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
index 9b55822..04e71d4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
@@ -33,24 +33,7 @@ USE left="270" FOR TABBING OPTIONS
tool_tip="Click to open Color Picker" width="65" />
-
- Client Tag Color:
-
- ("ShowClientNameTag", &gSavedSettings, true);
childSetValue("client_name_tag_check", (*sShowClientNameTag));
childSetValue("client_name_hover_check", gSavedSettings.getBOOL("ShowClientNameHoverTip"));
+ childSetValue("client_colors_check", gSavedSettings.getBOOL("ShowClientColor"));
childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
@@ -117,6 +118,7 @@ void LLPrefsAdvanced::apply()
gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check"));
gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check"));
gSavedSettings.setBOOL("ShowClientNameHoverTip", childGetValue("client_name_hover_check"));
+ gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_colors_check"));
gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
@@ -332,4 +334,3 @@ void LLPrefsAdvanced::onSaveAnyoneCloudButton(void * data)
std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
LLVOAvatar::saveCloud(filename, LLVOAvatar::sCloud);
}
-
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 8585a8e..b6deee9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -74,7 +74,7 @@ USE left="270" FOR TABBING OPTIONS
version3
-
-
- gridname Aurora-Grid
- gridnick auroragrid
- platform OpenSim
- loginuri http://login.aurora-sim.org:8002/
- loginpage http://login.aurora-sim.org/splash/
- helperuri http://grid.aurora-sim.org/
- password register support http://forum.aurora-sim.org/
- website http://aurora-sim.org
- version 0
-
-
gridnick worldsimterra
--
cgit v1.1
From 1c67ca5520e680fdb36ce370794bde7241386d87 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 15 Jun 2011 05:53:50 -0500
Subject: Fixed a nonfunctional help button in the Region/Estate window.
The help button for Minimum Agent Age was being initialized in the
code for the Debug tab, when it's actually in the Region tab.
---
linden/indra/newview/llfloaterregioninfo.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 3c3625b..60bdfcd 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -641,6 +641,7 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
initHelpBtn("land_resell_help", "HelpRegionLandResell");
initHelpBtn("parcel_changes_help", "HelpParcelChanges");
initHelpBtn("parcel_search_help", "HelpRegionSearch");
+ initHelpBtn("minimum_agent_age_help", "HelpRegionMinimumAge");
childSetAction("kick_btn", onClickKick, this);
childSetAction("kick_all_btn", onClickKickAll, this);
@@ -977,8 +978,6 @@ BOOL LLPanelRegionDebugInfo::postBuild()
initHelpBtn("top_colliders_help", "HelpRegionTopColliders");
initHelpBtn("top_scripts_help", "HelpRegionTopScripts");
initHelpBtn("restart_help", "HelpRegionRestart");
- initHelpBtn("minimum_agent_age_help", "HelpRegionMinimumAge");
-
childSetAction("choose_avatar_btn", onClickChooseAvatar, this);
childSetAction("return_btn", onClickReturn, this);
--
cgit v1.1
From ee38f7a26407f998352df80b6eb27d416a6a061b Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 15 Jun 2011 17:44:38 -0500
Subject: Removed Meta7 and WorldSimTerra from default_grids.xml.
Meta7 is definitely gone, WorldSimTerra seems to be, too.
---
.../indra/newview/app_settings/default_grids.xml | 32 +---------------------
1 file changed, 1 insertion(+), 31 deletions(-)
diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index cd76ea7..c5ef948 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -1,7 +1,7 @@
- default_grids_version 37
+ default_grids_version 38
@@ -62,21 +62,6 @@
version 3
-
-
- gridnick worldsimterra
- gridname WorldSimTerra
- platform OpenSim
- loginuri http://wsterra.com:8002
- loginpage http://wsterra.com/log.php
- helperuri http://wsterra.com/
- website http://www.worldsimterra.com/
- support http://www.worldsimterra.com/
- register http://www.worldsimterra.com/
- password http://www.worldsimterra.com/
- version 0
-
-
gridnick youralternativelife
@@ -196,21 +181,6 @@
version 2
-
-
- gridname Meta7
- gridnick meta7
- platform OpenSim
- loginuri http://login.meta7.com/
- loginpage http://api.meta7.com/loginscreen.php
- helperuri https://secure.meta7.com/
- password http://www.meta7.com/resetpass.php
- register http://www.meta7.com/register.php
- support http://www.meta7.com/support.php
- website http://meta7.com/
- version 0
-
-
gridname IEEE/ACM ScienceSim Virtual World
--
cgit v1.1
From 752588152dc9c60f1aba63ee60ea21473e3243db Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 16 Jun 2011 00:18:11 -0500
Subject: Fixed DicDownloadBaseURL to use http://app.kokuaviewer.org.
---
linden/indra/newview/app_settings/settings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 1fd8d6f..a6b782d 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2069,7 +2069,7 @@
Type
String
Value
- http://kokuaviewer.org/app/dics/
+ http://app.kokuaviewer.org/dics/
EmeraldEnableAutoCorrect
--
cgit v1.1
From 36644c930dab38fce499c92c88fff04052455979 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 17 Jun 2011 18:15:24 -0500
Subject: Clarified the terms for activating spellchecking dictionaries.
The UI for selecting dictionaries needs a fundamental revamp, but
this clarification should at least reduce some user confusion.
---
.../newview/skins/default/xui/en-us/panel_preferences_chat.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index e14442a..cf947ee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -215,7 +215,7 @@ USE left="270" FOR TABBING OPTIONS
- Current language (dictionary):
+ Base dictionary:
- Downloaded languages (dictionaries):
+ Available (inactive) extra dictionaries:
- Additional custom languages (dictionaries):
+ Active extra dictionaries: