diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llfloatermap.cpp | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llfloatermap.cpp')
-rw-r--r-- | linden/indra/newview/llfloatermap.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp index 36a9ab0..b333ff2 100644 --- a/linden/indra/newview/llfloatermap.cpp +++ b/linden/indra/newview/llfloatermap.cpp | |||
@@ -86,8 +86,6 @@ const S32 MAP_SCALE_MIN = 35; // in pixels per sim | |||
86 | const S32 MAP_SCALE_MAX = 180; // in pixels per sim | 86 | const S32 MAP_SCALE_MAX = 180; // in pixels per sim |
87 | const S32 MAP_SCALE_INCREMENT = 5; | 87 | const S32 MAP_SCALE_INCREMENT = 5; |
88 | 88 | ||
89 | const char MAP_TITLE[] = ""; | ||
90 | |||
91 | const S32 NETMAP_MIN_WIDTH = 128; | 89 | const S32 NETMAP_MIN_WIDTH = 128; |
92 | const S32 NETMAP_MIN_HEIGHT = 128; | 90 | const S32 NETMAP_MIN_HEIGHT = 128; |
93 | 91 | ||
@@ -118,8 +116,8 @@ LLFloaterMap *gFloaterMap = NULL; | |||
118 | LLFloaterMap::LLFloaterMap(const std::string& name) | 116 | LLFloaterMap::LLFloaterMap(const std::string& name) |
119 | : | 117 | : |
120 | LLFloater(name, | 118 | LLFloater(name, |
121 | "FloaterMiniMapRect", | 119 | std::string("FloaterMiniMapRect"), |
122 | MAP_TITLE, | 120 | LLStringUtil::null, |
123 | TRUE, | 121 | TRUE, |
124 | FLOATERMAP_MIN_WIDTH, | 122 | FLOATERMAP_MIN_WIDTH, |
125 | FLOATERMAP_MIN_HEIGHT_LARGE, | 123 | FLOATERMAP_MIN_HEIGHT_LARGE, |