diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-05-20 23:19:26 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-06-24 22:07:18 +0300 |
| commit | 48d2836ce6277f41c172ae5b68f2cb8845df7ad1 (patch) | |
| tree | 1e9eafefc45d80b572c8dd17807181ce1cff888c /indra/newview | |
| parent | 0c169dd37a82266d42b728ca6d5a7c20ee1ab208 (diff) | |
SL-17436 Tools floater drops negative Z position for attachments
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 3e6697b3c1..1fd1784d4b 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1661,13 +1661,13 @@ void LLPanelObject::sendPosition(BOOL btn_down) if (!regionp) return; - // Clamp the Z height - const F32 height = newpos.mV[VZ]; - const F32 min_height = LLWorld::getInstance()->getMinAllowedZ(mObject, mObject->getPositionGlobal()); - const F32 max_height = LLWorld::getInstance()->getRegionMaxHeight(); - if (!mObject->isAttachment()) { + // Clamp the Z height + const F32 height = newpos.mV[VZ]; + const F32 min_height = LLWorld::getInstance()->getMinAllowedZ(mObject, mObject->getPositionGlobal()); + const F32 max_height = LLWorld::getInstance()->getRegionMaxHeight(); + if ( height < min_height) { newpos.mV[VZ] = min_height; diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index f5214420b4..ade79b8884 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1505,6 +1505,7 @@ even though the user gets a free copy. layout="topleft" left_delta="0" max_val="4096" + min_val="-32" name="Pos Z" text_enabled_color="0 0.8 1 .65" top_pad="3" |