From 9800c590ba550aae95f40bf72abcad847b17143f Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 3 Sep 2015 15:23:22 +0300
Subject: [PATCH] MAINT-5378 fixing minor issues
---
indra/newview/llavatarrendernotifier.cpp | 1 -
indra/newview/llvoavatar.cpp | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp
index 921f1ceda16..da8bfae1a9d 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 9e689d98212..3116aefaed1 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)
{
--
GitLab