summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateropenobject.h
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2012-01-06 07:46:53 -0500
committerAura Linden <aura@lindenlab.com>2012-01-06 07:46:53 -0500
commitbd3a652eabf09a5843a6a0b8a9f60c4b402ecce5 (patch)
treef87e12efe45a6408fd49f436e82195e8e44242da /indra/newview/llfloateropenobject.h
parent570d562f5871f40bd7f8c683db5316ffd0133335 (diff)
Add capability-based create folder routine for more reliable inventory, with fix for copy and wear
Diffstat (limited to 'indra/newview/llfloateropenobject.h')
-rw-r--r--indra/newview/llfloateropenobject.h11
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: