From 3c758a06a38ba39e456d6e751d29e6fc8a6d9392 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Tue, 27 Sep 2011 12:37:02 -0400
Subject: [PATCH] Re-enabled Cancel TP button.

---
 indra/newview/lloverlaybar.cpp                             | 2 +-
 indra/newview/skins/default/xui/en-us/panel_overlaybar.xml | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp
index 5a7dfd0c3..d7a1d9a08 100644
--- a/indra/newview/lloverlaybar.cpp
+++ b/indra/newview/lloverlaybar.cpp
@@ -464,7 +464,7 @@ void LLOverlayBar::onClickStandUp(void*)
 void LLOverlayBar::onClickCancelTP(void* data)
 {
 	LLOverlayBar* self = (LLOverlayBar*)data;
-	self->setCancelTPButtonVisible(FALSE,std::string("Cancel"));
+	self->setCancelTPButtonVisible(FALSE, std::string("Cancel TP"));
 	gAgent.teleportCancel();
 	llinfos << "trying to cancel teleport" << llendl;
 }
diff --git a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index 678e48f6e..090a164d8 100644
--- a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -38,7 +38,10 @@
 					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
 					     label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up"
 					     scale_image="true" tool_tip="Click here to stand up." width="102" />
-				</layout_panel>
+          <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+					     label="Cancel TP" label_selected="Cancel TP" left="571" name="Cancel TP"
+					     scale_image="true" tool_tip="Click here to cancel the current teleport process." width="102" />
+        </layout_panel>
 				<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
 				     filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
 				     min_height="24" mouse_opaque="false" name="chat_bar"