diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 6ef64e4b4bd9dbdebaa232c06b0a78f0ae0849a6..66ce415541451384aab818427402dcdaa086bae3 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.13.3.2";
-CFBundleGetInfoString = "Second Life version 1.13.3.2, Copyright 2004-2006 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.13.3.3";
+CFBundleGetInfoString = "Second Life version 1.13.3.3, Copyright 2004-2006 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 6e1de8bb078a81d92fb31c3dc6812b5fcf2caeac..13901656b5d6ae0b1f8d3544d793b64ba46f5646 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.13.3.2</string>
+	<string>1.13.3.3</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 653dd636f905d337d9946f7d94f30cb9312f7b28..dda28020cd56ccb7df9f2072e0c5870a13ecc07d 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -1294,6 +1294,24 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
 	}
 
 	mPanelSecondLife->childSetVisible("online_yes", (online_status == ONLINE_STATUS_YES));
+
+	childSetVisible("Offer Teleport...",TRUE);
+	BOOL in_prelude = gAgent.inPrelude();
+	if(gAgent.isGodlike())
+	{
+		childSetEnabled("Offer Teleport...", TRUE);
+		childSetToolTip("Offer Teleport...", childGetValue("TeleportGod").asString());
+	}
+	else if (in_prelude)
+	{
+		childSetEnabled("Offer Teleport...",FALSE);
+		childSetToolTip("Offer Teleport...",childGetValue("TeleportPrelude").asString());
+	}
+	else
+	{
+		childSetEnabled("Offer Teleport...", (online_status == ONLINE_STATUS_YES));
+		childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
+	}
 }
 
 void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
@@ -1404,25 +1422,6 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
 			childSetVisible("Mute",TRUE);
 			childSetEnabled("Mute",FALSE);
 
-			childSetVisible("Offer Teleport...",TRUE);
-			BOOL in_prelude = gAgent.inPrelude();
-			if(gAgent.isGodlike())
-			{
-				childSetEnabled("Offer Teleport...", TRUE);
-				childSetToolTip("Offer Teleport...", childGetValue("TeleportGod").asString());
-			}
-			else if (in_prelude)
-			{
-				childSetEnabled("Offer Teleport...",FALSE);
-				childSetToolTip("Offer Teleport...",childGetValue("TeleportPrelude").asString());
-			}
-			else
-			{
-				// Even if user might be offline, allow a teleport offer.
-				BOOL maybe_online = (online_status != ONLINE_STATUS_NO);
-				childSetEnabled("Offer Teleport...", maybe_online);
-				childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
-			}
 			childSetVisible("drop target",TRUE);
 			childSetEnabled("drop target",FALSE);