diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 30fcd9f3a790b8e607ecc3fdb5f04e106c066802..1808584208013f6e6987d52a65cd1d0ec6be5641 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -191,7 +191,7 @@ class LLMapTrackAvatarHandler : public LLCommandHandler
 		
 		//Get the ID
 		LLUUID id;
-		if (!id.set( params[0].asStringRef(), FALSE ))
+		if (!id.set( params[0].asString(), FALSE))
 		{
 			return false;
 		}
@@ -299,6 +299,7 @@ void* LLFloaterWorldMap::createWorldMapView(void* data)
 BOOL LLFloaterWorldMap::postBuild()
 {
     mMapView = dynamic_cast<LLWorldMapView*>(getChild<LLPanel>("objects_mapview"));
+	mMapView->setPan(0, 0, true);
 
 	mTeleportButton = getChild<LLButton>("Teleport");
 	mShowDestinationButton = getChild<LLButton>("Show Destination");