aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterlandmark.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloaterlandmark.h')
-rw-r--r--linden/indra/newview/llfloaterlandmark.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterlandmark.h b/linden/indra/newview/llfloaterlandmark.h
index 7b5dc80..cf71138 100644
--- a/linden/indra/newview/llfloaterlandmark.h
+++ b/linden/indra/newview/llfloaterlandmark.h
@@ -66,7 +66,7 @@ public:
66 virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, 66 virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
67 BOOL drop, EDragAndDropType cargo_type, void *cargo_data, 67 BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
68 EAcceptance *accept, 68 EAcceptance *accept,
69 LLString& tooltip_msg); 69 std::string& tooltip_msg);
70 virtual BOOL handleKeyHere(KEY key, MASK mask); 70 virtual BOOL handleKeyHere(KEY key, MASK mask);
71 71
72 // LLFloater overrides 72 // LLFloater overrides
@@ -87,7 +87,7 @@ public:
87 static void onBtnRename( void* userdata ); 87 static void onBtnRename( void* userdata );
88 static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data); 88 static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
89 static void onShowFolders(LLUICtrl* ctrl, void* userdata); 89 static void onShowFolders(LLUICtrl* ctrl, void* userdata);
90 static void onSearchEdit(const LLString& search_string, void* user_data ); 90 static void onSearchEdit(const std::string& search_string, void* user_data );
91 91
92protected: 92protected:
93 LLPointer<LLViewerImage> mLandmarkp; 93 LLPointer<LLViewerImage> mLandmarkp;
@@ -101,7 +101,7 @@ protected:
101 LLTextBox* mTentativeLabel; 101 LLTextBox* mTentativeLabel;
102 LLTextBox* mResolutionLabel; 102 LLTextBox* mResolutionLabel;
103 103
104 LLString mPendingName; 104 std::string mPendingName;
105 BOOL mIsDirty; 105 BOOL mIsDirty;
106 BOOL mActive; 106 BOOL mActive;
107 107