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/llagent.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/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index f561f55e46..f1e0bc9308 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -591,10 +591,8 @@ public: //-------------------------------------------------------------------- // Wearables //-------------------------------------------------------------------- - BOOL getWearablesLoaded() const { return mWearablesLoaded; } - void setWearable( LLInventoryItem* new_item, LLWearable* wearable ); - static void onSetWearableDialog( S32 option, void* userdata ); + static bool onSetWearableDialog( const LLSD& notification, const LLSD& response, LLWearable* wearable ); void setWearableFinal( LLInventoryItem* new_item, LLWearable* new_wearable ); void setWearableOutfit( const LLInventoryItem::item_array_t& items, const LLDynamicArray< LLWearable* >& wearables, BOOL remove ); void queryWearableCache(); @@ -624,7 +622,7 @@ public: void makeNewOutfitDone(S32 index); void removeWearable( EWearableType type ); - static void onRemoveWearableDialog( S32 option, void* userdata ); + static bool onRemoveWearableDialog(const LLSD& notification, const LLSD& response ); void removeWearableFinal( EWearableType type ); void sendAgentWearablesUpdate(); |