Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enabled Cancel TP button.

Browse Source
This commit is contained in:
TighMacFanatic
2011-09-27 12:37:02 -04:00
parent 344df747d5
commit 3c758a06a3
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lloverlaybar.cpp
View File

@@ -464,7 +464,7 @@ void LLOverlayBar::onClickStandUp(void*)
void LLOverlayBar::onClickCancelTP(void* data) void LLOverlayBar::onClickCancelTP(void* data)
{ {
LLOverlayBar* self = (LLOverlayBar*)data; LLOverlayBar* self = (LLOverlayBar*)data;
self->setCancelTPButtonVisible(FALSE,std::string("Cancel")); self->setCancelTPButtonVisible(FALSE, std::string("Cancel TP"));
gAgent.teleportCancel(); gAgent.teleportCancel();
llinfos << "trying to cancel teleport" << llendl; llinfos << "trying to cancel teleport" << llendl;
} }

5
indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
View File

@@ -38,7 +38,10 @@
<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20" <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up" label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up"
scale_image="true" tool_tip="Click here to stand up." width="102" /> 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" <layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
filename="panel_chat_bar.xml" follows="left|right|bottom" left="0" filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
min_height="24" mouse_opaque="false" name="chat_bar" min_height="24" mouse_opaque="false" name="chat_bar"