1 files changed, 19 insertions, 19 deletions
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index 32f2d6e..18626b5 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -83,10 +83,10 @@ public:
        LLVector3d              viewPosToGlobal(S32 x,S32 y);
        virtual void    draw();
-        void                    drawGenericItems(const LLWorldMap::item_info_list_t& items, LLPointer<LLViewerImage> image);
+        void                    drawGenericItems(const LLWorldMap::item_info_list_t& items, LLUIImagePtr image);
-        void                    drawGenericItem(const LLItemInfo& item, LLPointer<LLViewerImage> image);
+        void                    drawGenericItem(const LLItemInfo& item, LLUIImagePtr image);
-        void                    drawImage(const LLVector3d& global_pos, LLPointer<LLViewerImage> image, const LLColor4& color = LLColor4::white);
+        void                    drawImage(const LLVector3d& global_pos, LLUIImagePtr image, const LLColor4& color = LLColor4::white);
-        void                    drawImageStack(const LLVector3d& global_pos, LLPointer<LLViewerImage> image, U32 count, F32 offset, const LLColor4& color);
+        void                    drawImageStack(const LLVector3d& global_pos, LLUIImagePtr image, U32 count, F32 offset, const LLColor4& color);
        void                    drawAgents();
        void                    drawEvents();
        void                    drawFrustum();
@@ -136,21 +136,21 @@ protected:
 public:
        LLColor4                mBackgroundColor;
-        static LLPointer<LLViewerImage> sAvatarYouSmallImage;
+        static LLUIImagePtr     sAvatarYouSmallImage;
-        static LLPointer<LLViewerImage> sAvatarSmallImage;
+        static LLUIImagePtr     sAvatarSmallImage;
-        static LLPointer<LLViewerImage> sAvatarLargeImage;
+        static LLUIImagePtr     sAvatarLargeImage;
-        static LLPointer<LLViewerImage> sAvatarAboveImage;
+        static LLUIImagePtr     sAvatarAboveImage;
-        static LLPointer<LLViewerImage> sAvatarBelowImage;
+        static LLUIImagePtr     sAvatarBelowImage;
-        static LLPointer<LLViewerImage> sTelehubImage;
+        static LLUIImagePtr     sTelehubImage;
-        static LLPointer<LLViewerImage> sInfohubImage;
+        static LLUIImagePtr     sInfohubImage;
-        static LLPointer<LLViewerImage> sHomeImage;
+        static LLUIImagePtr     sHomeImage;
-        static LLPointer<LLViewerImage> sEventImage;
+        static LLUIImagePtr     sEventImage;
-        static LLPointer<LLViewerImage> sEventMatureImage;
+        static LLUIImagePtr     sEventMatureImage;
-        static LLPointer<LLViewerImage> sTrackCircleImage;
+        static LLUIImagePtr     sTrackCircleImage;
-        static LLPointer<LLViewerImage> sTrackArrowImage;
+        static LLUIImagePtr     sTrackArrowImage;
-        static LLPointer<LLViewerImage> sClassifiedsImage;
+        static LLUIImagePtr     sClassifiedsImage;
-        static LLPointer<LLViewerImage> sPopularImage;
+        static LLUIImagePtr     sPopularImage;
-        static LLPointer<LLViewerImage> sForSaleImage;
+        static LLUIImagePtr     sForSaleImage;
        static F32              sThresholdA;
        static F32              sThresholdB;

diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h index 32f2d6e..18626b5 100644 --- a/linden/indra/newview/llworldmapview.h +++ b/linden/indra/newview/llworldmapview.h
@@ -83,10 +83,10 @@ public:
83	LLVector3d viewPosToGlobal(S32 x,S32 y);	83	LLVector3d viewPosToGlobal(S32 x,S32 y);
84		84
85	virtual void draw();	85	virtual void draw();
86	void drawGenericItems(const LLWorldMap::item_info_list_t& items, LLPointer<LLViewerImage> image);	86	void drawGenericItems(const LLWorldMap::item_info_list_t& items, LLUIImagePtr image);
87	void drawGenericItem(const LLItemInfo& item, LLPointer<LLViewerImage> image);	87	void drawGenericItem(const LLItemInfo& item, LLUIImagePtr image);
88	void drawImage(const LLVector3d& global_pos, LLPointer<LLViewerImage> image, const LLColor4& color = LLColor4::white);	88	void drawImage(const LLVector3d& global_pos, LLUIImagePtr image, const LLColor4& color = LLColor4::white);
89	void drawImageStack(const LLVector3d& global_pos, LLPointer<LLViewerImage> image, U32 count, F32 offset, const LLColor4& color);	89	void drawImageStack(const LLVector3d& global_pos, LLUIImagePtr image, U32 count, F32 offset, const LLColor4& color);
90	void drawAgents();	90	void drawAgents();
91	void drawEvents();	91	void drawEvents();
92	void drawFrustum();	92	void drawFrustum();
@@ -136,21 +136,21 @@ protected:
136	public:	136	public:
137	LLColor4 mBackgroundColor;	137	LLColor4 mBackgroundColor;
138		138
139	static LLPointer<LLViewerImage> sAvatarYouSmallImage;	139	static LLUIImagePtr sAvatarYouSmallImage;
140	static LLPointer<LLViewerImage> sAvatarSmallImage;	140	static LLUIImagePtr sAvatarSmallImage;
141	static LLPointer<LLViewerImage> sAvatarLargeImage;	141	static LLUIImagePtr sAvatarLargeImage;
142	static LLPointer<LLViewerImage> sAvatarAboveImage;	142	static LLUIImagePtr sAvatarAboveImage;
143	static LLPointer<LLViewerImage> sAvatarBelowImage;	143	static LLUIImagePtr sAvatarBelowImage;
144	static LLPointer<LLViewerImage> sTelehubImage;	144	static LLUIImagePtr sTelehubImage;
145	static LLPointer<LLViewerImage> sInfohubImage;	145	static LLUIImagePtr sInfohubImage;
146	static LLPointer<LLViewerImage> sHomeImage;	146	static LLUIImagePtr sHomeImage;
147	static LLPointer<LLViewerImage> sEventImage;	147	static LLUIImagePtr sEventImage;
148	static LLPointer<LLViewerImage> sEventMatureImage;	148	static LLUIImagePtr sEventMatureImage;
149	static LLPointer<LLViewerImage> sTrackCircleImage;	149	static LLUIImagePtr sTrackCircleImage;
150	static LLPointer<LLViewerImage> sTrackArrowImage;	150	static LLUIImagePtr sTrackArrowImage;
151	static LLPointer<LLViewerImage> sClassifiedsImage;	151	static LLUIImagePtr sClassifiedsImage;
152	static LLPointer<LLViewerImage> sPopularImage;	152	static LLUIImagePtr sPopularImage;
153	static LLPointer<LLViewerImage> sForSaleImage;	153	static LLUIImagePtr sForSaleImage;
154		154
155	static F32 sThresholdA;	155	static F32 sThresholdA;
156	static F32 sThresholdB;	156	static F32 sThresholdB;