summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-10 14:02:21 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-10 14:02:21 +0100
commit83f108503aa5a34bf24ef0a167d1b76ba3800a38 (patch)
tree1e5227e803980b3df83a77e0d0c39623e0fa2069 /indra/newview/llvoavatar.cpp
parentbd708f82bd3b87051e03a2794ce417ae6f432c08 (diff)
parent2f2a0ad38aecc1e9118cb51b86de578d56853311 (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r--indra/newview/llvoavatar.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 298ac28ca8..6392aad248 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5642,6 +5642,15 @@ BOOL LLVOAvatar::canAttachMoreObjects() const
}
//-----------------------------------------------------------------------------
+// canAttachMoreObjects()
+// Returns true if we can attach <n> more objects.
+//-----------------------------------------------------------------------------
+BOOL LLVOAvatar::canAttachMoreObjects(U32 n) const
+{
+ return (getNumAttachments() + n) <= MAX_AGENT_ATTACHMENTS;
+}
+
+//-----------------------------------------------------------------------------
// lazyAttach()
//-----------------------------------------------------------------------------
void LLVOAvatar::lazyAttach()