diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-06 07:58:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-06 07:58:35 -0500 |
| commit | 7b4f3f668b9f7553a418d0720994fe20d3e38f3a (patch) | |
| tree | c36ae368647cc672ccd9f8bfbb6b7a25fec95e85 /indra/newview/llfloateropenobject.h | |
| parent | cd103463c0cce1d1b243466bee3a2eaa45394051 (diff) | |
| parent | bd3a652eabf09a5843a6a0b8a9f60c4b402ecce5 (diff) | |
merge changes for vmrg-211
Diffstat (limited to 'indra/newview/llfloateropenobject.h')
| -rw-r--r-- | indra/newview/llfloateropenobject.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h index 0706e99f16..bf7fe69c65 100644 --- a/indra/newview/llfloateropenobject.h +++ b/indra/newview/llfloateropenobject.h @@ -45,10 +45,20 @@ 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; bool mWear; + bool mFolderResponded; }; protected: @@ -62,6 +72,7 @@ protected: void onClickMoveToInventory(); void onClickMoveAndWear(); + static void callbackCreateInventoryCategory(const LLSD& result, void* data); static void callbackMoveInventory(S32 result, void* data); private: |