diff options
author | Richard Nelson <none@none> | 2010-10-11 12:31:00 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-10-11 12:31:00 -0700 |
commit | 092e595b25e3e0cd27c480d864bfd894aaf3c987 (patch) | |
tree | 0d64e3cf12a3446ecd3a450b496756ab50a17bbd /indra/newview | |
parent | 67ac18dbe0e76a3b94f09768ee61b78585c0f2a0 (diff) |
EXP-172 FIXED Property lines flash on and off when right clicking on land in Skylight viewer
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
-rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1c7e391ccb..f3dea5b88b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8505,6 +8505,17 @@ <key>Value</key> <integer>512</integer> </map> + <key>RenderParcelSelection</key> + <map> + <key>Comment</key> + <string>Display selected parcel outline</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>RotateRight</key> <map> <key>Comment</key> diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 660bb93562..3c9e351ca1 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -850,7 +850,7 @@ LLParcel* LLViewerParcelMgr::getCollisionParcel() const void LLViewerParcelMgr::render() { - if (mSelected && mRenderSelection) + if (mSelected && mRenderSelection && gSavedSettings.getBOOL("RenderParcelSelection")) { // Rendering is done in agent-coordinates, so need to supply // an appropriate offset to the render code. |