diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-06-26 17:57:40 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-06-26 17:57:40 -0400 |
| commit | f388b32137fa150881a62eb852dee44d442fbeaa (patch) | |
| tree | 0660b9842a289f1538690d7fd286d621dc6b0361 /indra/newview/llfloateropenobject.h | |
| parent | ec00f7f14fbf16992b71ddd54e583ba07fdfd523 (diff) | |
| parent | e2e198d9b36f4ef90ef7ca088e643b1fc399c53e (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloateropenobject.h')
| -rwxr-xr-x | indra/newview/llfloateropenobject.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h index bf7fe69c65..8e472804a4 100755 --- a/indra/newview/llfloateropenobject.h +++ b/indra/newview/llfloateropenobject.h @@ -45,15 +45,6 @@ public: void dirty(); - class LLCategoryCreate - { - public: - LLCategoryCreate(LLUUID object_id, bool wear) : mObjectID(object_id), mWear(wear) {} - public: - LLUUID mObjectID; - bool mWear; - }; - struct LLCatAndWear { LLUUID mCatID; @@ -72,7 +63,7 @@ protected: void onClickMoveToInventory(); void onClickMoveAndWear(); - static void callbackCreateInventoryCategory(const LLSD& result, void* data); + static void callbackCreateInventoryCategory(const LLUUID& category_id, LLUUID object_id, bool wear); static void callbackMoveInventory(S32 result, void* data); private: |