aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterland.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloaterland.h')
-rw-r--r--linden/indra/newview/llfloaterland.h19
1 files changed, 4 insertions, 15 deletions
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index 7bb3ae8..551c7e3 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -13,12 +13,12 @@
13 * ("GPL"), unless you have obtained a separate licensing agreement 13 * ("GPL"), unless you have obtained a separate licensing agreement
14 * ("Other License"), formally executed by you and Linden Lab. Terms of 14 * ("Other License"), formally executed by you and Linden Lab. Terms of
15 * the GPL can be found in doc/GPL-license.txt in this distribution, or 15 * the GPL can be found in doc/GPL-license.txt in this distribution, or
16 * online at http://secondlife.com/developers/opensource/gplv2 16 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
17 * 17 *
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://secondlife.com/developers/opensource/flossexception 21 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
22 * 22 *
23 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
24 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -250,21 +250,17 @@ public:
250 static void onClickReturnOtherObjects(void*); 250 static void onClickReturnOtherObjects(void*);
251 static void onClickReturnOwnerList(void*); 251 static void onClickReturnOwnerList(void*);
252 static void onClickRefresh(void*); 252 static void onClickRefresh(void*);
253 static void onClickType(void*);
254 static void onClickName(void*);
255 static void onClickDesc(void*);
256 253
257 static void onDoubleClickOwner(void*); 254 static void onDoubleClickOwner(void*);
258 255
259 static void onCommitList(LLUICtrl* ctrl, void* data); 256 static void onCommitList(LLUICtrl* ctrl, void* data);
260 static void onLostFocus(LLUICtrl* caller, void* user_data); 257 static void onLostFocus(LLFocusableElement* caller, void* user_data);
261 258 static void onCommitClean(LLUICtrl* caller, void* user_data);
262 static void processParcelObjectOwnersReply(LLMessageSystem *msg, void **); 259 static void processParcelObjectOwnersReply(LLMessageSystem *msg, void **);
263 260
264 virtual BOOL postBuild(); 261 virtual BOOL postBuild();
265 262
266protected: 263protected:
267 void sortBtnCore(S32 column);
268 264
269 LLTextBox *mParcelObjectBonus; 265 LLTextBox *mParcelObjectBonus;
270 LLTextBox *mSWTotalObjects; 266 LLTextBox *mSWTotalObjects;
@@ -284,19 +280,12 @@ protected:
284 S32 mOtherTime; 280 S32 mOtherTime;
285 LLButton *mBtnRefresh; 281 LLButton *mBtnRefresh;
286 LLButton *mBtnReturnOwnerList; 282 LLButton *mBtnReturnOwnerList;
287 LLButton *mBtnType; // column 0
288 LLButton *mBtnName; // column 2
289 LLButton *mBtnDescription; // column 3
290 LLNameListCtrl *mOwnerList; 283 LLNameListCtrl *mOwnerList;
291 284
292 LLPointer<LLViewerImage> mIconAvatarOnline; 285 LLPointer<LLViewerImage> mIconAvatarOnline;
293 LLPointer<LLViewerImage> mIconAvatarOffline; 286 LLPointer<LLViewerImage> mIconAvatarOffline;
294 LLPointer<LLViewerImage> mIconGroup; 287 LLPointer<LLViewerImage> mIconGroup;
295 288
296 U32 mCurrentSortColumn;
297 BOOL mCurrentSortAscending;
298 S32 mColWidth[12];
299
300 BOOL mFirstReply; 289 BOOL mFirstReply;
301 290
302 uuid_list_t mSelectedOwners; 291 uuid_list_t mSelectedOwners;