aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelobject.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-03-29 14:11:34 +0200
committerArmin Weatherwax2010-04-12 17:11:05 +0200
commit5ac51f73e29ffa561b0dae87a06b6d5c1bd0e32e (patch)
tree82a152f5bfc4ec4160793c5e28cbaa0815976e1b /linden/indra/newview/llpanelobject.cpp
parentdisable voice (for the session) if binary not found (diff)
downloadmeta-impy-5ac51f73e29ffa561b0dae87a06b6d5c1bd0e32e.zip
meta-impy-5ac51f73e29ffa561b0dae87a06b6d5c1bd0e32e.tar.gz
meta-impy-5ac51f73e29ffa561b0dae87a06b6d5c1bd0e32e.tar.bz2
meta-impy-5ac51f73e29ffa561b0dae87a06b6d5c1bd0e32e.tar.xz
Use Hippogridmanager for OpenSim detection.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpanelobject.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 40dc211..bcbd076 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -79,7 +79,7 @@
79// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) 79// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
80#include "llvoavatar.h" 80#include "llvoavatar.h"
81// [/RLVa:KB] 81// [/RLVa:KB]
82 82#include "hippoLimits.h"
83// 83//
84// Constants 84// Constants
85// 85//
@@ -632,9 +632,9 @@ void LLPanelObject::getState( )
632 } 632 }
633 else 633 else
634 { 634 {
635 mCtrlScaleX->setMaxValue(LLManipScale::getMaxPrimSize()); 635 mCtrlScaleX->setMaxValue(gHippoLimits->getMaxPrimScale());
636 mCtrlScaleY->setMaxValue(LLManipScale::getMaxPrimSize()); 636 mCtrlScaleY->setMaxValue(gHippoLimits->getMaxPrimScale());
637 mCtrlScaleZ->setMaxValue(LLManipScale::getMaxPrimSize()); 637 mCtrlScaleZ->setMaxValue(gHippoLimits->getMaxPrimScale());
638 638
639 // Only allowed to change these parameters for objects 639 // Only allowed to change these parameters for objects
640 // that you have permissions on AND are not attachments. 640 // that you have permissions on AND are not attachments.