aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreviewlandmark.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llpreviewlandmark.h')
-rw-r--r--linden/indra/newview/llpreviewlandmark.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/linden/indra/newview/llpreviewlandmark.h b/linden/indra/newview/llpreviewlandmark.h
index 91088b0..f5da4ec 100644
--- a/linden/indra/newview/llpreviewlandmark.h
+++ b/linden/indra/newview/llpreviewlandmark.h
@@ -36,7 +36,6 @@
36 36
37#include "lllandmark.h" 37#include "lllandmark.h"
38 38
39#include "doublelinkedlist.h"
40#include "llfloater.h" 39#include "llfloater.h"
41#include "llmap.h" 40#include "llmap.h"
42#include "llstring.h" 41#include "llstring.h"
@@ -53,6 +52,7 @@ class LLLandmarkList;
53class LLLineEditor; 52class LLLineEditor;
54class LLMessageSystem; 53class LLMessageSystem;
55class LLPreviewLandmark; 54class LLPreviewLandmark;
55class LLPanelPlace;
56 56
57const S32 PREVIEW_LANDMARK_NUM_COLORS = 6; 57const S32 PREVIEW_LANDMARK_NUM_COLORS = 6;
58 58
@@ -78,9 +78,7 @@ public:
78 //static const LLPreviewLandmark* getFirst() { return LLPreviewLandmark::sOrderedInstances.getFirstData(); } 78 //static const LLPreviewLandmark* getFirst() { return LLPreviewLandmark::sOrderedInstances.getFirstData(); }
79 //static const LLPreviewLandmark* getNext() { return LLPreviewLandmark::sOrderedInstances.getNextData(); } 79 //static const LLPreviewLandmark* getNext() { return LLPreviewLandmark::sOrderedInstances.getNextData(); }
80 80
81 static void onTeleportBtn(void *user_data); 81 static void* createPlaceDetail(void* userdata);
82 //static void onFlyBtn(void *user_data);
83 static void onMapBtn(void *user_data);
84 82
85 /*virtual*/ void loadAsset(); 83 /*virtual*/ void loadAsset();
86 /*virtual*/ EAssetStatus getAssetStatus(); 84 /*virtual*/ EAssetStatus getAssetStatus();
@@ -93,7 +91,7 @@ private:
93// LLPointer<LLHUDText> mBeaconText; 91// LLPointer<LLHUDText> mBeaconText;
94 92
95 LLIconCtrl* mIconLandmark; 93 LLIconCtrl* mIconLandmark;
96 94 LLPanelPlace* mPlacePanel;
97 LLLandmark* mLandmark; 95 LLLandmark* mLandmark;
98 LLColor4 mMarkerColor; 96 LLColor4 mMarkerColor;
99 97