diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index deeca494c3d841cccc0c2f24745bc8b400a2d580..5b465864ccd60e5628e5b67d35feaebdef803308 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11316,11 +11316,11 @@
<key>ShowBanLines</key>
<map>
<key>Comment</key>
- <string>Show in-world ban/access borders</string>
+ <string>Show in-world ban/access borders, 0 - do not show, 1 - show on collision, 2 - show on proximity</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
<integer>1</integer>
</map>
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 175f1849cf9ec934518f1767b8f57a30c2a3dc10..25e9ade7dff7a281f62a95ae68c82fd3ac406d17 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -741,6 +741,12 @@ void LLViewerParcelMgr::renderCollisionSegments(U8* segments, BOOL use_pass, LLV
gGL.end();
}
+void LLViewerParcelMgr::resetCollisionTimer()
+{
+ mCollisionTimer.reset();
+ mRenderCollision = TRUE;
+}
+
void draw_line_cube(F32 width, const LLVector3& center)
{
width = 0.5f * width;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a0223a5dbbd615ea2baabcd22b264bed685122e4..111e70bfe9846e7d6a508f4e385e0c98dab93c5b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9060,6 +9060,25 @@ class LLWorldPostProcess : public view_listener_t
}
};
+class LLWorldCheckBanLines : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ S32 callback_data = userdata.asInteger();
+ return gSavedSettings.getS32("ShowBanLines") == callback_data;
+ }
+};
+
+class LLWorldShowBanLines : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ S32 callback_data = userdata.asInteger();
+ gSavedSettings.setS32("ShowBanLines", callback_data);
+ return true;
+ }
+};
+
void handle_flush_name_caches()
{
if (gCacheName) gCacheName->clear();
@@ -9349,6 +9368,8 @@ void initialize_menus()
view_listener_t::addMenu(new LLWorldEnvPreset(), "World.EnvPreset");
view_listener_t::addMenu(new LLWorldEnableEnvPreset(), "World.EnableEnvPreset");
view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess");
+ view_listener_t::addMenu(new LLWorldCheckBanLines() , "World.CheckBanLines");
+ view_listener_t::addMenu(new LLWorldShowBanLines() , "World.ShowBanLines");
// Tools menu
view_listener_t::addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c1a9b6be80fe7581819995e9343ed8cf08d175ae..a535433b5b34db0443fc671bc88d7510b23e1495 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5151,6 +5151,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
LandBuyAccessBlocked_AdultsOnlyContent
-----------------------------------------------------------------------*/
+ LLViewerParcelMgr::getInstance()->resetCollisionTimer();
if (handle_special_notification(notificationID, llsdBlock))
{
return true;
@@ -5319,6 +5320,11 @@ void process_alert_message(LLMessageSystem *msgsystem, void **user_data)
{
BOOL modal = FALSE;
process_alert_core(message, modal);
+
+ if (message.find("Cannot enter parcel") != std::string::npos)
+ {
+ LLViewerParcelMgr::getInstance()->resetCollisionTimer();
+ }
}
}
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 97dc916bfe8d920dd11a4150e3c25279612ab03c..bb6827855598b505d0774cb933c61f6dcbb86b15 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -72,7 +72,11 @@
#include "llenvironment.h"
-const F32 PARCEL_COLLISION_DRAW_SECS = 1.f;
+const F32 PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION = 10.f;
+const F32 PARCEL_COLLISION_DRAW_SECS_ON_PROXIMITY = 1.f;
+const S32 PARCEL_BAN_LINES_HIDE = 0;
+const S32 PARCEL_BAN_LINES_ON_COLLISION = 1;
+const S32 PARCEL_BAN_LINES_ON_PROXIMITY = 2;
// Globals
@@ -892,13 +896,18 @@ void LLViewerParcelMgr::render()
void LLViewerParcelMgr::renderParcelCollision()
{
+ static LLCachedControl<S32> ban_lines_mode(gSavedSettings , "ShowBanLines" , PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION);
+
// check for expiration
- if (mCollisionTimer.getElapsedTimeF32() > PARCEL_COLLISION_DRAW_SECS)
+ F32 expiration = (ban_lines_mode == PARCEL_BAN_LINES_ON_PROXIMITY)
+ ? PARCEL_COLLISION_DRAW_SECS_ON_PROXIMITY
+ : PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION;
+ if (mCollisionTimer.getElapsedTimeF32() > expiration)
{
- mRenderCollision = FALSE;
+ mRenderCollision = false;
}
- if (mRenderCollision && gSavedSettings.getBOOL("ShowBanLines"))
+ if (mRenderCollision && ban_lines_mode != PARCEL_BAN_LINES_HIDE)
{
LLViewerRegion* regionp = gAgent.getRegion();
if (regionp)
@@ -1842,8 +1851,11 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
sequence_id == COLLISION_BANNED_PARCEL_SEQ_ID)
{
// We're about to collide with this parcel
- parcel_mgr.mRenderCollision = TRUE;
- parcel_mgr.mCollisionTimer.reset();
+ static LLCachedControl<S32> ban_lines_mode(gSavedSettings , "ShowBanLines" , PARCEL_BAN_LINES_DRAW_SECS_ON_COLLISION);
+ if (ban_lines_mode == PARCEL_BAN_LINES_ON_PROXIMITY)
+ {
+ parcel_mgr.resetCollisionTimer();
+ }
// Differentiate this parcel if we are banned from it.
if (sequence_id == COLLISION_BANNED_PARCEL_SEQ_ID)
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
index 6ce389ab88860c60cd4cd104d8a127746bab8240..d45ff674af7c5b49758e18cceae22c17fc6e73a2 100644
--- a/indra/newview/llviewerparcelmgr.h
+++ b/indra/newview/llviewerparcelmgr.h
@@ -204,6 +204,7 @@ class LLViewerParcelMgr : public LLSingleton<LLViewerParcelMgr>
void renderOneSegment(F32 x1, F32 y1, F32 x2, F32 y2, F32 height, U8 direction, LLViewerRegion* regionp);
void renderHighlightSegments(const U8* segments, LLViewerRegion* regionp);
void renderCollisionSegments(U8* segments, BOOL use_pass, LLViewerRegion* regionp);
+ void resetCollisionTimer();
void sendParcelGodForceOwner(const LLUUID& owner_id);
@@ -361,7 +362,7 @@ class LLViewerParcelMgr : public LLSingleton<LLViewerParcelMgr>
// If it's coming, draw the parcel's boundaries.
LLParcel* mCollisionParcel;
U8* mCollisionSegments;
- BOOL mRenderCollision;
+ bool mRenderCollision;
BOOL mRenderSelection;
S32 mCollisionBanned;
LLFrameTimer mCollisionTimer;
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 58584345a980c9f76ac2a18a26931e76e788246c..64167a9a5d605aa15d4c651d6171954e9ab9f8c5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -794,14 +794,36 @@
name="LandShow"
tear_off="true">
<menu_item_check
- label="Ban Lines"
- name="Ban Lines">
+ label="Hide Ban Lines"
+ name="Hide Ban Lines">
<menu_item_check.on_check
- control="ShowBanLines" />
+ function="World.CheckBanLines"
+ parameter="0" />
<menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowBanLines" />
+ function="World.ShowBanLines"
+ parameter="0" />
+ </menu_item_check>
+ <menu_item_check
+ label="Show Ban Lines On Collision"
+ name="Show Ban Lines On Collision">
+ <menu_item_check.on_check
+ function="World.CheckBanLines"
+ parameter="1" />
+ <menu_item_check.on_click
+ function="World.ShowBanLines"
+ parameter="1" />
+ </menu_item_check>
+ <menu_item_check
+ label="Show Ban Lines On Proximity"
+ name="Show Ban Lines On Proximity">
+ <menu_item_check.on_check
+ function="World.CheckBanLines"
+ parameter="2" />
+ <menu_item_check.on_click
+ function="World.ShowBanLines"
+ parameter="2" />
</menu_item_check>
+ <menu_item_separator />
<menu_item_check
label="Beacons"
name="beacons"