1 files changed, 32 insertions, 4 deletions

diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 213faf0..9257349 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -279,6 +279,13 @@ void LLFloaterWorldMap::onClose(bool app_quitting)
 // static
 void LLFloaterWorldMap::show(void*, BOOL center_on_target)
 {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0c)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         BOOL was_visible = gFloaterWorldMap->getVisible();
 
         gFloaterWorldMap->mIsClosing = FALSE;
@@ -326,6 +333,7 @@ void LLFloaterWorldMap::show(void*, BOOL center_on_target)
 
                 // If nothing is being tracked, set flag so the user position will be found
                 gFloaterWorldMap->mSetToUserPosition = ( LLTracker::getTrackingStatus() == LLTracker::TRACKING_NOTHING );
+
         }
         
         if (center_on_target)
@@ -452,7 +460,8 @@ void LLFloaterWorldMap::draw()
         childSetEnabled("Go Home", enable_go_home);
 
         updateLocation();
-        
+
+
         LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus(); 
         if (LLTracker::TRACKING_AVATAR == tracking_status)
         {
@@ -498,7 +507,6 @@ void LLFloaterWorldMap::draw()
                 centerOnTarget(TRUE);
         }
 
-        childSetEnabled("Teleport", (BOOL)tracking_status);
 //      childSetEnabled("Clear", (BOOL)tracking_status);
         childSetEnabled("Show Destination", (BOOL)tracking_status || LLWorldMap::getInstance()->mIsTrackingUnknownLocation);
         childSetEnabled("copy_slurl", (mSLURL.size() > 0) );
@@ -650,7 +658,10 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
         F32 region_x = (F32)fmod( pos_global.mdV[VX], (F64)REGION_WIDTH_METERS );
         F32 region_y = (F32)fmod( pos_global.mdV[VY], (F64)REGION_WIDTH_METERS );
         std::string full_name = llformat("%s (%d, %d, %d)", 
-                                                                  sim_name.c_str(), 
+//                                                                sim_name.c_str(), 
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a)
+                (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? sim_name.c_str() : rlv_handler_t::cstrHiddenRegion.c_str(),
+// [/RLVa:KB]
                                                                   llround(region_x), 
                                                                   llround(region_y),
                                                                   llround((F32)pos_global.mdV[VZ]));
@@ -704,6 +715,14 @@ void LLFloaterWorldMap::updateLocation()
 
                                 // Set the current SLURL
                                 mSLURL = LLURLDispatcher::buildSLURL(agent_sim_name, agent_x, agent_y, agent_z);
+
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                                {
+                                        childSetValue("location", rlv_handler_t::cstrHiddenRegion);
+                                        mSLURL.clear();
+                                }
+// [/RLVa:KB]
                         }
                 }
 
@@ -746,13 +765,21 @@ void LLFloaterWorldMap::updateLocation()
                 {       // Empty SLURL will disable the "Copy SLURL to clipboard" button
                         mSLURL = "";
                 }
+
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                {
+                        childSetValue("location", rlv_handler_t::cstrHiddenRegion);
+                        mSLURL.clear();
+                }
+// [/RLVa:KB]
         }
 }
 
 void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
 {
         LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
-        z_coord = llclamp(z_coord, 0, 4096);
+        z_coord = llclamp(z_coord, 0, 1000);
         if (sim_info)
         {
                 LLVector3 local_pos;
@@ -1062,6 +1089,7 @@ void LLFloaterWorldMap::onPanBtn( void* userdata )
 void LLFloaterWorldMap::onGoHome(void*)
 {
         gAgent.teleportHomeConfirm();
+        gFloaterWorldMap->close();
 }