summaryrefslogtreecommitdiff
path: root/indra/newview/llagentwearables.h
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-05-28 11:39:28 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-05-28 11:39:28 -0400
commit7983de22074beb25a832f89aa3e7a9728baca328 (patch)
tree4812d1e655e8c4c3c48c00dbefa79b62cafe20ce /indra/newview/llagentwearables.h
parent955698c7a6d04c1ed895bfc2b9b5acf4e8d5473e (diff)
parente07deaa3dac6b9bc651034543c174e974b4b9ad2 (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llagentwearables.h')
-rw-r--r--indra/newview/llagentwearables.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h
index c53b1333fc..5d5c5ae371 100644
--- a/indra/newview/llagentwearables.h
+++ b/indra/newview/llagentwearables.h
@@ -102,6 +102,9 @@ public:
U32 getWearableCount(const LLWearableType::EType type) const;
U32 getWearableCount(const U32 tex_index) const;
+ static const U32 MAX_CLOTHING_PER_TYPE = 5;
+
+
//--------------------------------------------------------------------
// Setters
//--------------------------------------------------------------------
@@ -274,8 +277,6 @@ private:
LLPointer<LLRefCount> mCB;
};
- static const U32 MAX_WEARABLES_PER_TYPE = 1;
-
}; // LLAgentWearables
extern LLAgentWearables gAgentWearables;