summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-10-21 09:16:56 -0400
committerOz Linden <oz@lindenlab.com>2014-10-21 09:16:56 -0400
commit4c8e526b99cb717e9086dec87a94b56fecad8984 (patch)
tree45294c593721be9bc8def1563b07438554dfa08b /indra/newview/llappearancemgr.cpp
parentd3387faca57c560279a6b8b83711a789b84f0ecd (diff)
parenta0a61ff61e6cf38ccbd0d0a9eecb10d532feaf55 (diff)
merge changes for callum fixes and workarounds
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rwxr-xr-xindra/newview/llappearancemgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 29534a4382..b3b8a40d39 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3752,7 +3752,7 @@ bool LLAppearanceMgr::moveWearable(LLViewerInventoryItem* item, bool closer_to_b
//to cause appearance of the agent to be updated
bool result = false;
- if (result = gAgentWearables.moveWearable(item, closer_to_body))
+ if ((result = gAgentWearables.moveWearable(item, closer_to_body)))
{
gAgentAvatarp->wearableUpdated(item->getWearableType());
}