diff options
Diffstat (limited to 'linden/indra/newview/llfloaterland.h')
-rw-r--r-- | linden/indra/newview/llfloaterland.h | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h index 6e26b93..113b679 100644 --- a/linden/indra/newview/llfloaterland.h +++ b/linden/indra/newview/llfloaterland.h | |||
@@ -18,7 +18,8 @@ | |||
18 | * There are special exceptions to the terms and conditions of the GPL as | 18 | * There are special exceptions to the terms and conditions of the GPL as |
19 | * it is applied to this Source Code. View the full text of the exception | 19 | * it is applied to this Source Code. View the full text of the exception |
20 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
21 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 21 | * online at |
22 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
22 | * | 23 | * |
23 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
24 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
@@ -37,7 +38,8 @@ | |||
37 | #include <vector> | 38 | #include <vector> |
38 | 39 | ||
39 | #include "llfloater.h" | 40 | #include "llfloater.h" |
40 | #include "llviewerimagelist.h" | 41 | //#include "llviewerimagelist.h" |
42 | #include "llmemory.h" // LLPointer<> | ||
41 | 43 | ||
42 | typedef std::set<LLUUID, lluuid_less> uuid_list_t; | 44 | typedef std::set<LLUUID, lluuid_less> uuid_list_t; |
43 | const F32 CACHE_REFRESH_TIME = 2.5f; | 45 | const F32 CACHE_REFRESH_TIME = 2.5f; |
@@ -55,6 +57,7 @@ class LLTabContainer; | |||
55 | class LLTextBox; | 57 | class LLTextBox; |
56 | class LLTextEditor; | 58 | class LLTextEditor; |
57 | class LLTextureCtrl; | 59 | class LLTextureCtrl; |
60 | class LLUIImage; | ||
58 | class LLViewerTextEditor; | 61 | class LLViewerTextEditor; |
59 | class LLParcelSelection; | 62 | class LLParcelSelection; |
60 | 63 | ||
@@ -93,8 +96,7 @@ protected: | |||
93 | LLFloaterLand(const LLSD& seed); | 96 | LLFloaterLand(const LLSD& seed); |
94 | virtual ~LLFloaterLand(); | 97 | virtual ~LLFloaterLand(); |
95 | 98 | ||
96 | void refresh(); | 99 | /*virtual*/ void refresh(); |
97 | |||
98 | 100 | ||
99 | static void* createPanelLandGeneral(void* data); | 101 | static void* createPanelLandGeneral(void* data); |
100 | static void* createPanelLandCovenant(void* data); | 102 | static void* createPanelLandCovenant(void* data); |
@@ -134,7 +136,7 @@ class LLPanelLandGeneral | |||
134 | public: | 136 | public: |
135 | LLPanelLandGeneral(LLSafeHandle<LLParcelSelection>& parcelp); | 137 | LLPanelLandGeneral(LLSafeHandle<LLParcelSelection>& parcelp); |
136 | virtual ~LLPanelLandGeneral(); | 138 | virtual ~LLPanelLandGeneral(); |
137 | void refresh(); | 139 | /*virtual*/ void refresh(); |
138 | void refreshNames(); | 140 | void refreshNames(); |
139 | virtual void draw(); | 141 | virtual void draw(); |
140 | 142 | ||
@@ -155,8 +157,7 @@ public: | |||
155 | static void finalizeSetSellChange(void * userdata); | 157 | static void finalizeSetSellChange(void * userdata); |
156 | static void onSalePriceChange(LLUICtrl *ctrl, void * userdata); | 158 | static void onSalePriceChange(LLUICtrl *ctrl, void * userdata); |
157 | 159 | ||
158 | static void cbBuyPass(S32 option, void*); | 160 | static bool cbBuyPass(const LLSD& notification, const LLSD& response); |
159 | static BOOL buyPassDialogVisible(); | ||
160 | 161 | ||
161 | static void onClickSellLand(void* data); | 162 | static void onClickSellLand(void* data); |
162 | static void onClickStopSellLand(void* data); | 163 | static void onClickStopSellLand(void* data); |
@@ -189,6 +190,9 @@ protected: | |||
189 | LLTextBox* mTextOwnerLabel; | 190 | LLTextBox* mTextOwnerLabel; |
190 | LLTextBox* mTextOwner; | 191 | LLTextBox* mTextOwner; |
191 | LLButton* mBtnProfile; | 192 | LLButton* mBtnProfile; |
193 | |||
194 | LLTextBox* mContentRating; | ||
195 | LLTextBox* mLandType; | ||
192 | 196 | ||
193 | LLTextBox* mTextGroup; | 197 | LLTextBox* mTextGroup; |
194 | LLTextBox* mTextGroupLabel; | 198 | LLTextBox* mTextGroupLabel; |
@@ -235,13 +239,13 @@ class LLPanelLandObjects | |||
235 | public: | 239 | public: |
236 | LLPanelLandObjects(LLSafeHandle<LLParcelSelection>& parcelp); | 240 | LLPanelLandObjects(LLSafeHandle<LLParcelSelection>& parcelp); |
237 | virtual ~LLPanelLandObjects(); | 241 | virtual ~LLPanelLandObjects(); |
238 | void refresh(); | 242 | /*virtual*/ void refresh(); |
239 | virtual void draw(); | 243 | virtual void draw(); |
240 | 244 | ||
241 | static void callbackReturnOwnerObjects(S32, void*); | 245 | bool callbackReturnOwnerObjects(const LLSD& notification, const LLSD& response); |
242 | static void callbackReturnGroupObjects(S32, void*); | 246 | bool callbackReturnGroupObjects(const LLSD& notification, const LLSD& response); |
243 | static void callbackReturnOtherObjects(S32, void*); | 247 | bool callbackReturnOtherObjects(const LLSD& notification, const LLSD& response); |
244 | static void callbackReturnOwnerList(S32, void*); | 248 | bool callbackReturnOwnerList(const LLSD& notification, const LLSD& response); |
245 | 249 | ||
246 | static void clickShowCore(LLPanelLandObjects* panelp, S32 return_type, uuid_list_t* list = 0); | 250 | static void clickShowCore(LLPanelLandObjects* panelp, S32 return_type, uuid_list_t* list = 0); |
247 | static void onClickShowOwnerObjects(void*); | 251 | static void onClickShowOwnerObjects(void*); |
@@ -285,9 +289,9 @@ protected: | |||
285 | LLButton *mBtnReturnOwnerList; | 289 | LLButton *mBtnReturnOwnerList; |
286 | LLNameListCtrl *mOwnerList; | 290 | LLNameListCtrl *mOwnerList; |
287 | 291 | ||
288 | LLUIImagePtr mIconAvatarOnline; | 292 | LLPointer<LLUIImage> mIconAvatarOnline; |
289 | LLUIImagePtr mIconAvatarOffline; | 293 | LLPointer<LLUIImage> mIconAvatarOffline; |
290 | LLUIImagePtr mIconGroup; | 294 | LLPointer<LLUIImage> mIconGroup; |
291 | 295 | ||
292 | BOOL mFirstReply; | 296 | BOOL mFirstReply; |
293 | 297 | ||
@@ -306,18 +310,20 @@ class LLPanelLandOptions | |||
306 | public: | 310 | public: |
307 | LLPanelLandOptions(LLSafeHandle<LLParcelSelection>& parcelp); | 311 | LLPanelLandOptions(LLSafeHandle<LLParcelSelection>& parcelp); |
308 | virtual ~LLPanelLandOptions(); | 312 | virtual ~LLPanelLandOptions(); |
309 | void refresh(); | 313 | /*virtual*/ BOOL postBuild(); |
314 | /*virtual*/ void draw(); | ||
315 | /*virtual*/ void refresh(); | ||
310 | 316 | ||
317 | private: | ||
318 | // Refresh the "show in search" checkbox and category selector. | ||
319 | void refreshSearch(); | ||
311 | 320 | ||
312 | static void onCommitAny(LLUICtrl* ctrl, void *userdata); | 321 | static void onCommitAny(LLUICtrl* ctrl, void *userdata); |
313 | static void onClickSet(void* userdata); | 322 | static void onClickSet(void* userdata); |
314 | static void onClickClear(void* userdata); | 323 | static void onClickClear(void* userdata); |
315 | static void onClickPublishHelp(void*); | 324 | static void onClickPublishHelp(void*); |
316 | 325 | ||
317 | virtual BOOL postBuild(); | 326 | private: |
318 | virtual void draw(); | ||
319 | |||
320 | protected: | ||
321 | LLCheckBoxCtrl* mCheckEditObjects; | 327 | LLCheckBoxCtrl* mCheckEditObjects; |
322 | LLCheckBoxCtrl* mCheckEditGroupObjects; | 328 | LLCheckBoxCtrl* mCheckEditGroupObjects; |
323 | LLCheckBoxCtrl* mCheckAllObjectEntry; | 329 | LLCheckBoxCtrl* mCheckAllObjectEntry; |