aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llworldmapview.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-22 09:46:20 -0700
committerMcCabe Maxsted2009-09-22 09:46:20 -0700
commit0a700b3b3a145733345d88ba1f6a6cd34c10ac3e (patch)
treeab02f29c1a453a354561faca5c2bf33e5b22cb2f /linden/indra/newview/llworldmapview.h
parentFixed map textures displaying as X (diff)
parentApplied Aimee's minimap zoom patch (diff)
downloadmeta-impy-0a700b3b3a145733345d88ba1f6a6cd34c10ac3e.zip
meta-impy-0a700b3b3a145733345d88ba1f6a6cd34c10ac3e.tar.gz
meta-impy-0a700b3b3a145733345d88ba1f6a6cd34c10ac3e.tar.bz2
meta-impy-0a700b3b3a145733345d88ba1f6a6cd34c10ac3e.tar.xz
Merged 1.2.0-minimap-magnify into 1.2.0-radarzoom
Diffstat (limited to 'linden/indra/newview/llworldmapview.h')
-rw-r--r--linden/indra/newview/llworldmapview.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index b97dfb5..b6ab855 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -136,11 +136,13 @@ protected:
136public: 136public:
137 LLColor4 mBackgroundColor; 137 LLColor4 mBackgroundColor;
138 138
139 static LLUIImagePtr sAvatarYouSmallImage;
140 static LLUIImagePtr sAvatarSmallImage; 139 static LLUIImagePtr sAvatarSmallImage;
141 static LLUIImagePtr sAvatarLargeImage; 140 static LLUIImagePtr sAvatarYouImage;
141 static LLUIImagePtr sAvatarYouLargeImage;
142 static LLUIImagePtr sAvatarLevelImage;
142 static LLUIImagePtr sAvatarAboveImage; 143 static LLUIImagePtr sAvatarAboveImage;
143 static LLUIImagePtr sAvatarBelowImage; 144 static LLUIImagePtr sAvatarBelowImage;
145
144 static LLUIImagePtr sTelehubImage; 146 static LLUIImagePtr sTelehubImage;
145 static LLUIImagePtr sInfohubImage; 147 static LLUIImagePtr sInfohubImage;
146 static LLUIImagePtr sHomeImage; 148 static LLUIImagePtr sHomeImage;