diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-08-29 12:00:11 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-08-29 12:00:11 +0300 |
| commit | 3656d80cf873a8e2852b262d6b5ed88608fdc49b (patch) | |
| tree | 0eb0137697daf7601fdd4cb56b76ad2efb97cf01 /indra/newview/llfloateropenobject.h | |
| parent | af6e0afac80477dedab75415bba379d2b577b9d8 (diff) | |
MAINT-4239 FIXED Buttons are added to Object contents floater
Diffstat (limited to 'indra/newview/llfloateropenobject.h')
| -rwxr-xr-x | indra/newview/llfloateropenobject.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h index 8e472804a4..2e761f99bf 100755 --- a/indra/newview/llfloateropenobject.h +++ b/indra/newview/llfloateropenobject.h @@ -50,6 +50,7 @@ public: LLUUID mCatID; bool mWear; bool mFolderResponded; + bool mReplace; }; protected: @@ -59,11 +60,13 @@ protected: void draw(); virtual void onOpen(const LLSD& key); - void moveToInventory(bool wear); + void moveToInventory(bool wear, bool replace = false); void onClickMoveToInventory(); void onClickMoveAndWear(); - static void callbackCreateInventoryCategory(const LLUUID& category_id, LLUUID object_id, bool wear); + void onClickReplace(); + void onClickCancel(); + static void callbackCreateInventoryCategory(const LLUUID& category_id, LLUUID object_id, bool wear, bool replace = false); static void callbackMoveInventory(S32 result, void* data); private: |