livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-1403 FIX View floater options do not function

meow-7.2.2
Richard Linden 2011-10-18 12:20:36 -07:00
parent 525eb6ba9f
commit 591ad2bde7
2 changed files with 1 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloatercamera.cpp
View File

@ -347,6 +347,7 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val)
mPrevMode(CAMERA_CTRL_MODE_PAN)
{
LLHints::registerHintTarget("view_popup", LLView::getHandle());
mCommitCallbackRegistrar.add("CameraPresets.ChangeView", boost::bind(&LLFloaterCamera::onClickCameraItem, _2));
}
// virtual

163
indra/newview/skins/default/xui/en/menu_bottomtray.xml
View File

@ -1,163 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu
height="201"
layout="topleft"
left="100"
mouse_opaque="false"
name="hide_camera_move_controls_menu"
top="624"
visible="false"
width="128">
<menu_item_check
label="Speak Button"
layout="topleft"
name="EnableVoiceChat">
<menu_item_check.on_click
function="ToggleControl"
parameter="EnableVoiceChat" />
<menu_item_check.on_check
function="CheckControl"
parameter="EnableVoiceChat" />
</menu_item_check>
<menu_item_check
label="Gesture button"
layout="topleft"
name="ShowGestureButton">
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowGestureButton" />
<menu_item_check.on_check
function="CheckControl"
parameter="ShowGestureButton" />
</menu_item_check>
<menu_item_check
label="Move button"
layout="topleft"
name="ShowMoveButton">
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowMoveButton" />
<menu_item_check.on_check
function="CheckControl"
parameter="ShowMoveButton" />
</menu_item_check>
<menu_item_check
label="View button"
layout="topleft"
name="ShowCameraButton">
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowCameraButton" />
<menu_item_check.on_check
function="CheckControl"
parameter="ShowCameraButton" />
</menu_item_check>
<menu_item_check
label="Snapshot button"
layout="topleft"
name="ShowSnapshotButton">
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowSnapshotButton" />
<menu_item_check.on_check
function="CheckControl"
parameter="ShowSnapshotButton" />
</menu_item_check>
<menu_item_check
label="Build button"
layout="topleft"
name="ShowBuildButton">
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowBuildButton" />
<menu_item_check.on_check
function="CheckControl"
parameter="ShowBuildButton" />
</menu_item_check>
<menu_item_check
label="Search button"
layout="topleft"
name="ShowSearchButton">
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowSearchButton" />
<menu_item_check.on_check
function="CheckControl"
parameter="ShowSearchButton" />
</menu_item_check>
<menu_item_check
label="Map button"
layout="topleft"
name="ShowWorldMapButton">
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowWorldMapButton" />
<menu_item_check.on_check
function="CheckControl"
parameter="ShowWorldMapButton" />
</menu_item_check>
<menu_item_check
label="Mini-map button"
layout="topleft"
name="ShowMiniMapButton">
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowMiniMapButton" />
<menu_item_check.on_check
function="CheckControl"
parameter="ShowMiniMapButton" />
</menu_item_check>
<menu_item_separator
name="Separator" />
<menu_item_call
label="Cut"
name="NearbyChatBar_Cut">
<menu_item_call.on_click
function="NearbyChatBar.Action"
parameter="cut" />
<menu_item_call.on_enable
function="NearbyChatBar.EnableMenuItem"
parameter="can_cut" />
</menu_item_call>
<menu_item_call
label="Copy"
name="NearbyChatBar_Copy">
<menu_item_call.on_click
function="NearbyChatBar.Action"
parameter="copy" />
<menu_item_call.on_enable
function="NearbyChatBar.EnableMenuItem"
parameter="can_copy" />
</menu_item_call>
<menu_item_call
label="Paste"
name="NearbyChatBar_Paste">
<menu_item_call.on_click
function="NearbyChatBar.Action"
parameter="paste" />
<menu_item_call.on_enable
function="NearbyChatBar.EnableMenuItem"
parameter="can_paste" />
</menu_item_call>
<menu_item_call
label="Delete"
name="NearbyChatBar_Delete">
<menu_item_call.on_click
function="NearbyChatBar.Action"
parameter="delete" />
<menu_item_call.on_enable
function="NearbyChatBar.EnableMenuItem"
parameter="can_delete" />
</menu_item_call>
<menu_item_call
label="Select All"
name="NearbyChatBar_Select_All">
<menu_item_call.on_click
function="NearbyChatBar.Action"
parameter="select_all" />
<menu_item_call.on_enable
function="NearbyChatBar.EnableMenuItem"
parameter="can_select_all" />
</menu_item_call>
</menu>