Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLWorld::getMinAllowedZ now passed an object and an explicit position (opposed to assuming object->getPositionGlobal())

Browse Source
This commit is contained in:
Shyotl
2011-08-19 01:32:35 -05:00
parent e4b640887a
commit 73d4722706
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llmaniptranslate.cpp
View File

@@ -743,7 +743,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
LLVector3d new_position_global = selectNode->mSavedPositionGlobal + clamped_relative_move; LLVector3d new_position_global = selectNode->mSavedPositionGlobal + clamped_relative_move;
// Don't let object centers go too far underground // Don't let object centers go too far underground
F64 min_height = LLWorld::getInstance()->getMinAllowedZ(object); F64 min_height = LLWorld::getInstance()->getMinAllowedZ(object, object->getPositionGlobal());
if (new_position_global.mdV[VZ] < min_height) if (new_position_global.mdV[VZ] < min_height)
{ {
new_position_global.mdV[VZ] = min_height; new_position_global.mdV[VZ] = min_height;

2
indra/newview/llpanelobject.cpp
View File

@@ -2154,7 +2154,7 @@ void LLPanelObject::sendPosition(BOOL btn_down)
// Clamp the Z height // Clamp the Z height
const F32 height = newpos.mV[VZ]; const F32 height = newpos.mV[VZ];
const F32 min_height = LLWorld::getInstance()->getMinAllowedZ(mObject); const F32 min_height = LLWorld::getInstance()->getMinAllowedZ(mObject, mObject->getPositionGlobal());
// <edit> // <edit>
//const F32 max_height = LLWorld::getInstance()->getRegionMaxHeight(); //const F32 max_height = LLWorld::getInstance()->getRegionMaxHeight();
const F32 max_height = F32(340282346638528859811704183484516925440.0f); const F32 max_height = F32(340282346638528859811704183484516925440.0f);

4
indra/newview/llworld.cpp
View File

@@ -439,9 +439,9 @@ BOOL LLWorld::positionRegionValidGlobal(const LLVector3d &pos_global)
// Allow objects to go up to their radius underground. // Allow objects to go up to their radius underground.
F32 LLWorld::getMinAllowedZ(LLViewerObject* object) F32 LLWorld::getMinAllowedZ(LLViewerObject* object, const LLVector3d &global_pos)
{ {
F32 land_height = resolveLandHeightGlobal(object->getPositionGlobal()); F32 land_height = resolveLandHeightGlobal(global_pos);
F32 radius = 0.5f * object->getScale().length(); F32 radius = 0.5f * object->getScale().length();
return land_height - radius; return land_height - radius;
} }

2
indra/newview/llworld.h
View File

@@ -95,7 +95,7 @@ public:
// Return the lowest allowed Z point to prevent objects from being moved // Return the lowest allowed Z point to prevent objects from being moved
// underground. // underground.
F32 getMinAllowedZ(LLViewerObject* object); F32 getMinAllowedZ(LLViewerObject* object, const LLVector3d &global_pos);
// takes a line segment defined by point_a and point_b, then // takes a line segment defined by point_a and point_b, then
// determines the closest (to point_a) point of intersection that is // determines the closest (to point_a) point of intersection that is