diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
| commit | 667ca55bad0108c4bdf8f007b89e1a52fc766aad (patch) | |
| tree | 7bd62ac8d9af079c3994565f3f200ccc250bbc28 /indra/newview/llfloaterland.h | |
| parent | 95f365789f4cebc7bd97ccefd538f14d481a8373 (diff) | |
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Diffstat (limited to 'indra/newview/llfloaterland.h')
| -rw-r--r-- | indra/newview/llfloaterland.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h index 9bed9d53ae..1d95a3e3f6 100644 --- a/indra/newview/llfloaterland.h +++ b/indra/newview/llfloaterland.h @@ -151,8 +151,7 @@ public: static void finalizeSetSellChange(void * userdata); static void onSalePriceChange(LLUICtrl *ctrl, void * userdata); - static void cbBuyPass(S32 option, void*); - static BOOL buyPassDialogVisible(); + static bool cbBuyPass(const LLSD& notification, const LLSD& response); static void onClickSellLand(void* data); static void onClickStopSellLand(void* data); @@ -234,10 +233,10 @@ public: void refresh(); virtual void draw(); - static void callbackReturnOwnerObjects(S32, void*); - static void callbackReturnGroupObjects(S32, void*); - static void callbackReturnOtherObjects(S32, void*); - static void callbackReturnOwnerList(S32, void*); + bool callbackReturnOwnerObjects(const LLSD& notification, const LLSD& response); + bool callbackReturnGroupObjects(const LLSD& notification, const LLSD& response); + bool callbackReturnOtherObjects(const LLSD& notification, const LLSD& response); + bool callbackReturnOwnerList(const LLSD& notification, const LLSD& response); static void clickShowCore(LLPanelLandObjects* panelp, S32 return_type, uuid_list_t* list = 0); static void onClickShowOwnerObjects(void*); |