summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2015-09-03 15:23:22 +0300
committerandreykproductengine <akleshchev@productengine.com>2015-09-03 15:23:22 +0300
commit9800c590ba550aae95f40bf72abcad847b17143f (patch)
tree0c9fa96e1785791ed59c53252cba54f092baab55 /indra
parent6f3b21b98d6adfc093c2a049c637b22603195a98 (diff)
MAINT-5378 fixing minor issues
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llavatarrendernotifier.cpp1
-rwxr-xr-xindra/newview/llvoavatar.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp
index 921f1ceda1..da8bfae1a9 100644
--- a/indra/newview/llavatarrendernotifier.cpp
+++ b/indra/newview/llavatarrendernotifier.cpp
@@ -37,7 +37,6 @@
#include "llnotifications.h"
#include "llnotificationsutil.h"
#include "llnotificationtemplate.h"
-#include "llstartup.h"
#include "lltimer.h"
#include "llvoavatarself.h"
#include "llviewercontrol.h"
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 9e689d9821..3116aefaed 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8438,7 +8438,7 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
mVisualComplexity = cost;
mVisualComplexityStale = false;
- LLCachedControl<U32> show_my_complexity_changes(gSavedSettings, "ShowMyComplexityChanges", 20);
+ static LLCachedControl<U32> show_my_complexity_changes(gSavedSettings, "ShowMyComplexityChanges", 20);
if (isSelf() && show_my_complexity_changes)
{