diff options
author | Armin Weatherwax | 2010-08-23 18:05:43 +0200 |
---|---|---|
committer | McCabe Maxsted | 2010-08-28 05:01:19 -0700 |
commit | 4944fdee161600d57add7b8a0a15305eeea06d06 (patch) | |
tree | 66b6f71d51452dce5d185f854dbd89595afad8d2 /linden/indra/newview/llpanelobject.cpp | |
parent | Emerald: copy/paste buttons for prim pos/rot/scale in panelobject (diff) | |
download | meta-impy-4944fdee161600d57add7b8a0a15305eeea06d06.zip meta-impy-4944fdee161600d57add7b8a0a15305eeea06d06.tar.gz meta-impy-4944fdee161600d57add7b8a0a15305eeea06d06.tar.bz2 meta-impy-4944fdee161600d57add7b8a0a15305eeea06d06.tar.xz |
replace hardcoded SL limits by hippolimits
Diffstat (limited to 'linden/indra/newview/llpanelobject.cpp')
-rw-r--r-- | linden/indra/newview/llpanelobject.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp index 1a9d8bf..2d2a6b2 100644 --- a/linden/indra/newview/llpanelobject.cpp +++ b/linden/indra/newview/llpanelobject.cpp | |||
@@ -2244,7 +2244,7 @@ void LLPanelObject::onPastePos(void* user_data) | |||
2244 | LLCalc* calcp = LLCalc::getInstance(); | 2244 | LLCalc* calcp = LLCalc::getInstance(); |
2245 | mClipboardPos.mV[VX] = llclamp( mClipboardPos.mV[VX], 0.f, 256.f); | 2245 | mClipboardPos.mV[VX] = llclamp( mClipboardPos.mV[VX], 0.f, 256.f); |
2246 | mClipboardPos.mV[VY] = llclamp( mClipboardPos.mV[VY], 0.f, 256.f); | 2246 | mClipboardPos.mV[VY] = llclamp( mClipboardPos.mV[VY], 0.f, 256.f); |
2247 | mClipboardPos.mV[VZ] = llclamp( mClipboardPos.mV[VZ], 0.f, 4096.f); | 2247 | mClipboardPos.mV[VZ] = llclamp( mClipboardPos.mV[VZ], 0.f, gHippoLimits->getMaxHeight()); |
2248 | 2248 | ||
2249 | self->mCtrlPosX->set( mClipboardPos.mV[VX] ); | 2249 | self->mCtrlPosX->set( mClipboardPos.mV[VX] ); |
2250 | self->mCtrlPosY->set( mClipboardPos.mV[VY] ); | 2250 | self->mCtrlPosY->set( mClipboardPos.mV[VY] ); |
@@ -2262,9 +2262,9 @@ void LLPanelObject::onPasteSize(void* user_data) | |||
2262 | 2262 | ||
2263 | LLPanelObject* self = (LLPanelObject*) user_data; | 2263 | LLPanelObject* self = (LLPanelObject*) user_data; |
2264 | LLCalc* calcp = LLCalc::getInstance(); | 2264 | LLCalc* calcp = LLCalc::getInstance(); |
2265 | mClipboardSize.mV[VX] = llclamp(mClipboardSize.mV[VX], 0.01f, 10.f); | 2265 | mClipboardSize.mV[VX] = llclamp(mClipboardSize.mV[VX], gHippoLimits->getMinPrimScale(), gHippoLimits->getMaxPrimScale()); |
2266 | mClipboardSize.mV[VY] = llclamp(mClipboardSize.mV[VY], 0.01f, 10.f); | 2266 | mClipboardSize.mV[VY] = llclamp(mClipboardSize.mV[VY], gHippoLimits->getMinPrimScale(), gHippoLimits->getMaxPrimScale()); |
2267 | mClipboardSize.mV[VZ] = llclamp(mClipboardSize.mV[VZ], 0.01f, 10.f); | 2267 | mClipboardSize.mV[VZ] = llclamp(mClipboardSize.mV[VZ], gHippoLimits->getMinPrimScale(), gHippoLimits->getMaxPrimScale()); |
2268 | 2268 | ||
2269 | self->mCtrlScaleX->set( mClipboardSize.mV[VX] ); | 2269 | self->mCtrlScaleX->set( mClipboardSize.mV[VX] ); |
2270 | self->mCtrlScaleY->set( mClipboardSize.mV[VY] ); | 2270 | self->mCtrlScaleY->set( mClipboardSize.mV[VY] ); |
@@ -2323,7 +2323,7 @@ void LLPanelObject::onPastePosClip(void* user_data) | |||
2323 | 2323 | ||
2324 | mClipboardPos.mV[VX] = llclamp(mClipboardPos.mV[VX], 0.f, 256.f); | 2324 | mClipboardPos.mV[VX] = llclamp(mClipboardPos.mV[VX], 0.f, 256.f); |
2325 | mClipboardPos.mV[VY] = llclamp(mClipboardPos.mV[VY], 0.f, 256.f); | 2325 | mClipboardPos.mV[VY] = llclamp(mClipboardPos.mV[VY], 0.f, 256.f); |
2326 | mClipboardPos.mV[VZ] = llclamp(mClipboardPos.mV[VZ], 0.f, 4096.f); | 2326 | mClipboardPos.mV[VZ] = llclamp(mClipboardPos.mV[VZ], 0.f, gHippoLimits->getMaxHeight()); |
2327 | 2327 | ||
2328 | self->mCtrlPosX->set( mClipboardPos.mV[VX] ); | 2328 | self->mCtrlPosX->set( mClipboardPos.mV[VX] ); |
2329 | self->mCtrlPosY->set( mClipboardPos.mV[VY] ); | 2329 | self->mCtrlPosY->set( mClipboardPos.mV[VY] ); |
@@ -2345,9 +2345,9 @@ void LLPanelObject::onPasteSizeClip(void* user_data) | |||
2345 | std::string stringVec = wstring_to_utf8str(temp_string); | 2345 | std::string stringVec = wstring_to_utf8str(temp_string); |
2346 | if(!getvectorfromclip(stringVec, &mClipboardSize)) return; | 2346 | if(!getvectorfromclip(stringVec, &mClipboardSize)) return; |
2347 | 2347 | ||
2348 | mClipboardSize.mV[VX] = llclamp(mClipboardSize.mV[VX], 0.01f, 10.f); | 2348 | mClipboardSize.mV[VX] = llclamp(mClipboardSize.mV[VX], gHippoLimits->getMinPrimScale(), gHippoLimits->getMaxPrimScale()); |
2349 | mClipboardSize.mV[VY] = llclamp(mClipboardSize.mV[VY], 0.01f, 10.f); | 2349 | mClipboardSize.mV[VY] = llclamp(mClipboardSize.mV[VY], gHippoLimits->getMinPrimScale(), gHippoLimits->getMaxPrimScale()); |
2350 | mClipboardSize.mV[VZ] = llclamp(mClipboardSize.mV[VZ], 0.01f, 10.f); | 2350 | mClipboardSize.mV[VZ] = llclamp(mClipboardSize.mV[VZ], gHippoLimits->getMinPrimScale(), gHippoLimits->getMaxPrimScale()); |
2351 | 2351 | ||
2352 | self->mCtrlScaleX->set( mClipboardSize.mV[VX] ); | 2352 | self->mCtrlScaleX->set( mClipboardSize.mV[VX] ); |
2353 | self->mCtrlScaleY->set( mClipboardSize.mV[VY] ); | 2353 | self->mCtrlScaleY->set( mClipboardSize.mV[VY] ); |