aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorthickbrick2010-11-10 16:43:49 +0200
committerthickbrick2010-11-10 16:43:49 +0200
commit5c181529a528f5f80737652b914fca42205ac92e (patch)
tree0cec1c29158eb7a6246f80e35d1426ac3b0b0389 /linden/indra
parentMerge branch 'weekly' of https://github.com/AlericInglewood/imprudence into w... (diff)
downloadmeta-impy-5c181529a528f5f80737652b914fca42205ac92e.zip
meta-impy-5c181529a528f5f80737652b914fca42205ac92e.tar.gz
meta-impy-5c181529a528f5f80737652b914fca42205ac92e.tar.bz2
meta-impy-5c181529a528f5f80737652b914fca42205ac92e.tar.xz
Fix #699: Can't drag prims with translate manipulator
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/hippolimits.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp
index 851e191..3368ba4 100644
--- a/linden/indra/newview/hippolimits.cpp
+++ b/linden/indra/newview/hippolimits.cpp
@@ -21,7 +21,8 @@ HippoLimits::HippoLimits()
21 mMaxHollow(0.95f), 21 mMaxHollow(0.95f),
22 mMinPrimScale(0.001f), 22 mMinPrimScale(0.001f),
23 mMaxPrimScale(256.0f), 23 mMaxPrimScale(256.0f),
24 mMaxLinkedPrims(-1) 24 mMaxLinkedPrims(-1),
25 mMaxDragDistance(0.f)
25{ 26{
26 setLimits(); 27 setLimits();
27} 28}
@@ -207,7 +208,7 @@ F32 HippoLimits::getMinPrimZPos() const
207 208
208F32 HippoLimits::getMaxDragDistance() const 209F32 HippoLimits::getMaxDragDistance() const
209{ 210{
210 if (mMaxDragDistance == 0) 211 if (mMaxDragDistance == 0.f)
211 { 212 {
212 return FLT_MAX; 213 return FLT_MAX;
213 } 214 }
@@ -215,9 +216,9 @@ F32 HippoLimits::getMaxDragDistance() const
215 { 216 {
216 F32 max_drag_distance = gSavedSettings.getBOOL("LimitDragDistance") ? gSavedSettings.getF32("MaxDragDistance") : FLT_MAX; 217 F32 max_drag_distance = gSavedSettings.getBOOL("LimitDragDistance") ? gSavedSettings.getF32("MaxDragDistance") : FLT_MAX;
217 218
218 if(max_drag_distance > mMaxDragDistance) //Chose the more restrictive 219 if(max_drag_distance > mMaxDragDistance) //Chose the more restrictive
219 { 220 {
220 max_drag_distance = mMaxDragDistance; 221 max_drag_distance = mMaxDragDistance;
221 } 222 }
222 return max_drag_distance; 223 return max_drag_distance;
223 } 224 }