From 89a510de10c48ebcf82b98a962e4bf66477dcc93 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 4 Sep 2009 01:56:20 -0500
Subject: Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.

Made a few non-functional changes to help it apply.
---
 linden/indra/newview/lltracker.cpp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'linden/indra/newview/lltracker.cpp')

diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp
index bd2f659..cf98c7a 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -180,8 +180,12 @@ void LLTracker::render3D()
 		}
 		else
 		{
-			renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, 
-					  	instance()->mBeaconText, instance()->mTrackedLocationName );
+			//renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, 
+			//		  	instance()->mBeaconText, instance()->mTrackedLocationName );
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
+			renderBeacon(instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, 
+				(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLocationName : rlv_handler_t::cstrHidden);
+// [/RLVa:KB]
 		}
 	}
 
@@ -222,8 +226,12 @@ void LLTracker::render3D()
 					// and back again
 					instance()->mHasReachedLandmark = FALSE;
 				}
-				renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, 
-							  instance()->mBeaconText, instance()->mTrackedLandmarkName );
+				//renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, 
+				//			  instance()->mBeaconText, instance()->mTrackedLandmarkName );
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
+				renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, 
+					(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLandmarkName : rlv_handler_t::cstrHidden);
+// [/RLVa:KB]
 			}
 		}
 		else
@@ -251,8 +259,12 @@ void LLTracker::render3D()
 			}
 			else
 			{
-				renderBeacon( av_tracker.getGlobalPos(), gTrackColor, 
-						  	instance()->mBeaconText, av_tracker.getName() );
+				//renderBeacon( av_tracker.getGlobalPos(), gTrackColor, 
+				//		  	instance()->mBeaconText, av_tracker.getName() );
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
+				renderBeacon( av_tracker.getGlobalPos(), gTrackColor, instance()->mBeaconText, 
+					(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? av_tracker.getName() : rlv_handler_t::cstrHidden);
+// [/RLVa:KB]
 			}
 		}
 		else
-- 
cgit v1.1