diff options
| author | Northspring <pantera.polnocy@phoenixviewer.com> | 2014-12-19 23:30:06 +0100 |
|---|---|---|
| committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2014-12-19 23:30:06 +0100 |
| commit | 35a39d5ea1cea63a3356a6cd310a3c3a90644b1c (patch) | |
| tree | 9f097a8abfe45fb44c2d8f8746a609bdda8acd7f /indra/newview/llfloateropenobject.h | |
| parent | 09e94a2b5d0bf6feb8b2a4f8ad86346f0201714d (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
Merge
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: |