diff options
author | Oz Linden <oz@lindenlab.com> | 2013-05-20 09:08:20 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-05-20 09:08:20 -0400 |
commit | 72e7269da376d660385f3c66ac2a25a5e50871ea (patch) | |
tree | 047bd9d1bf99fa8c308c379dd57758050aa5ef51 /indra/newview/llpanellandmarkinfo.cpp | |
parent | 621085d553cccc4238d74886ca44bcefafddd7f1 (diff) | |
parent | 0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff) |
merge changes for 3.5.2-release
Diffstat (limited to 'indra/newview/llpanellandmarkinfo.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/newview/llpanellandmarkinfo.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp index c57746ec00..5c9b968ac9 100644..100755 --- a/indra/newview/llpanellandmarkinfo.cpp +++ b/indra/newview/llpanellandmarkinfo.cpp @@ -209,24 +209,6 @@ void LLPanelLandmarkInfo::processParcelInfo(const LLParcelData& parcel_data) mMaturityRatingText->setText(LLViewerRegion::accessToString(SIM_ACCESS_PG)); } - S32 region_x; - S32 region_y; - S32 region_z; - - // If the region position is zero, grab position from the global - if(mPosRegion.isExactlyZero()) - { - region_x = llround(parcel_data.global_x) % REGION_WIDTH_UNITS; - region_y = llround(parcel_data.global_y) % REGION_WIDTH_UNITS; - region_z = llround(parcel_data.global_z); - } - else - { - region_x = llround(mPosRegion.mV[VX]); - region_y = llround(mPosRegion.mV[VY]); - region_z = llround(mPosRegion.mV[VZ]); - } - LLSD info; info["update_verbs"] = true; info["global_x"] = parcel_data.global_x; |