summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-12-21 15:35:56 +0200
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-12-21 15:35:56 +0200
commit2610af9798374ce9fff7623d7aa7e269b2a78174 (patch)
tree4dbdaa1c767b337252179bcc0f6c5ce03b87cf82 /indra/newview
parentd1898ef3b8cf1344bd1f3980b500d4d2f5c10593 (diff)
CHUI-619 FUI button and conversation line items blink at different rates:
changed rate
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/app_settings/settings.xml2
-rw-r--r--indra/newview/llimview.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ebc915ec5a..507eb33f2d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13173,7 +13173,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.25</real>
+ <real>0.5</real>
</map>
<key>WindLightUseAtmosShaders</key>
<map>
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index cdc51ad2fc..708400cbe1 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -964,7 +964,7 @@ const std::string LLIMModel::getName(const LLUUID& session_id) const
{
LLIMSession* session = findIMSession(session_id);
- if (!session)
+ if (!session)
{
llwarns << "session " << session_id << "does not exist " << llendl;
return LLTrans::getString("no_session_message");