summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-11-19 08:36:53 -0800
committerAndrew Meadows <andrew@lindenlab.com>2010-11-19 08:36:53 -0800
commitc320b2cef916cc8f0e42f041c29c04bf55d40d77 (patch)
tree58569a17e1c88ffc1a236e4878cd7b21afca058c /indra/newview
parent424786d8d05093abd816a3decd86aace64816179 (diff)
Fixing a typo that broke the build.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 64892c7ee1..df89e6759d 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -518,10 +518,10 @@ void LLViewerObject::setNameValueList(const std::string& name_value_list)
// agent.
bool LLViewerObject::isReturnable()
{
- LLBBox(getPositionRegion(), getRotationRegion(), getScale() * -0.5f, getScale() * 0.5f);
+ LLBBox box_in_region_frame(getPositionRegion(), getRotationRegion(), getScale() * -0.5f, getScale() * 0.5f);
return !isAttachment()
&& mRegionp
- && mRegionp->objectIsReturnable(getPositionRegion(), getBoundingBoxRegion());
+ && mRegionp->objectIsReturnable(getPositionRegion(), box_in_region_frame);
}
BOOL LLViewerObject::setParent(LLViewerObject* parent)