summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 98a97b9457..e5c272a264 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -207,6 +207,7 @@
#include "llstartuplistener.h"
#include "lltoolbarview.h"
#include "llexperiencelog.h"
+#include "llgroupcolormap.h" // group-based nameplate tinting
#include "llcleanup.h"
#include "llenvironment.h"
@@ -3344,6 +3345,9 @@ void LLStartUp::initExperiences()
boost::bind(&LLAgent::getRegionCapability, &gAgent, _1));
LLExperienceLog::instance().initialize();
+
+ // Load per-group nameplate colors for this account
+ LLGroupColorMap::getInstance()->loadFromDisk();
}
void LLStartUp::cleanupNameCache()