aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorRobin Cornelius2011-10-01 22:16:53 +0100
committerDavid Walter Seikel2013-04-05 23:10:32 +1000
commit0528bbd5ef37b7d60c639db2c450cca415b6590e (patch)
treef88830cb3867a2009872f6cf3ff718e5d6271305 /linden/indra/newview/llstartup.cpp
parentFor Armin and his teapot. (diff)
downloadmeta-impy-0528bbd5ef37b7d60c639db2c450cca415b6590e.zip
meta-impy-0528bbd5ef37b7d60c639db2c450cca415b6590e.tar.gz
meta-impy-0528bbd5ef37b7d60c639db2c450cca415b6590e.tar.bz2
meta-impy-0528bbd5ef37b7d60c639db2c450cca415b6590e.tar.xz
MOAP Radar patch set
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
-rw-r--r--linden/indra/newview/llstartup.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 922de18..d853dc0 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -206,6 +206,8 @@
206#include "rlvhandler.h" 206#include "rlvhandler.h"
207// [/RLVa:KB] 207// [/RLVa:KB]
208 208
209#include "rcmoapradar.h"
210
209#if LL_WINDOWS 211#if LL_WINDOWS
210#include "llwindebug.h" 212#include "llwindebug.h"
211#include "lldxhardware.h" 213#include "lldxhardware.h"
@@ -2079,6 +2081,16 @@ bool idle_startup()
2079 LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0); 2081 LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0);
2080 gViewerWindow->adjustControlRectanglesForFirstUse(window); 2082 gViewerWindow->adjustControlRectanglesForFirstUse(window);
2081 2083
2084 if (gSavedSettings.getBOOL("ShowRadar"))
2085 {
2086 LLFloaterAvatarList::showInstance();
2087 }
2088
2089 if (gSavedSettings.getBOOL("ShowMOAPRadar"))
2090 {
2091 LLFloaterMOAPRadar::showInstance();
2092 }
2093
2082 if(gSavedSettings.getBOOL("ShowMiniMap")) 2094 if(gSavedSettings.getBOOL("ShowMiniMap"))
2083 { 2095 {
2084 LLFloaterMap::showInstance(); 2096 LLFloaterMap::showInstance();