diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index e6bbac824742f2adafa69e2243f989ead7a91273..6fa2da7bacd0f189cf6b6ec04616dad95f025913 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -120,7 +120,7 @@ BOOL LLPanelObject::postBuild()
childSetCommitCallback("Phantom Checkbox Ctrl",onCommitPhantom,this);
// Position
- mMenuPastePos = getChild<LLMenuButton>("paste_pos_btn");
+ mMenuClipboardPos = getChild<LLMenuButton>("clipboard_pos_btn");
mLabelPosition = getChild<LLTextBox>("label position");
mCtrlPosX = getChild<LLSpinCtrl>("Pos X");
childSetCommitCallback("Pos X",onCommitPosition,this);
@@ -130,7 +130,7 @@ BOOL LLPanelObject::postBuild()
childSetCommitCallback("Pos Z",onCommitPosition,this);
// Scale
- mMenuPasteSize = getChild<LLMenuButton>("paste_size_btn");
+ mMenuClipboardSize = getChild<LLMenuButton>("clipboard_size_btn");
mLabelSize = getChild<LLTextBox>("label size");
mCtrlScaleX = getChild<LLSpinCtrl>("Scale X");
childSetCommitCallback("Scale X",onCommitScale,this);
@@ -144,7 +144,7 @@ BOOL LLPanelObject::postBuild()
childSetCommitCallback("Scale Z",onCommitScale,this);
// Rotation
- mMenuPasteRot = getChild<LLMenuButton>("paste_rot_btn");
+ mMenuClipboardRot = getChild<LLMenuButton>("clipboard_rot_btn");
mLabelRotation = getChild<LLTextBox>("label rotation");
mCtrlRotX = getChild<LLSpinCtrl>("Rot X");
childSetCommitCallback("Rot X",onCommitRotation,this);
@@ -382,7 +382,7 @@ void LLPanelObject::getState( )
calcp->clearVar(LLCalc::Z_POS);
}
- mMenuPastePos->setEnabled(enable_move);
+ mMenuClipboardPos->setEnabled(enable_move);
mLabelPosition->setEnabled( enable_move );
mCtrlPosX->setEnabled(enable_move);
mCtrlPosY->setEnabled(enable_move);
@@ -408,7 +408,7 @@ void LLPanelObject::getState( )
calcp->setVar(LLCalc::Z_SCALE, 0.f);
}
- mMenuPasteSize->setEnabled(enable_scale);
+ mMenuClipboardSize->setEnabled(enable_scale);
mLabelSize->setEnabled( enable_scale );
mCtrlScaleX->setEnabled( enable_scale );
mCtrlScaleY->setEnabled( enable_scale );
@@ -440,7 +440,7 @@ void LLPanelObject::getState( )
calcp->clearVar(LLCalc::Z_ROT);
}
- mMenuPasteRot->setEnabled(enable_rotate);
+ mMenuClipboardRot->setEnabled(enable_rotate);
mLabelRotation->setEnabled( enable_rotate );
mCtrlRotX->setEnabled( enable_rotate );
mCtrlRotY->setEnabled( enable_rotate );
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index e8f8d0eb9ae353f98e99419dd0a4286085547203..764c0d8af4711470d48fb78bf37a3e9df60af192 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -141,20 +141,20 @@ class LLPanelObject : public LLPanel
LLTextBox* mLabelRevolutions;
LLSpinCtrl* mSpinRevolutions;
- LLMenuButton* mMenuPastePos;
+ LLMenuButton* mMenuClipboardPos;
LLTextBox* mLabelPosition;
LLSpinCtrl* mCtrlPosX;
LLSpinCtrl* mCtrlPosY;
LLSpinCtrl* mCtrlPosZ;
- LLMenuButton* mMenuPasteSize;
+ LLMenuButton* mMenuClipboardSize;
LLTextBox* mLabelSize;
LLSpinCtrl* mCtrlScaleX;
LLSpinCtrl* mCtrlScaleY;
LLSpinCtrl* mCtrlScaleZ;
BOOL mSizeChanged;
- LLMenuButton* mMenuPasteRot;
+ LLMenuButton* mMenuClipboardRot;
LLTextBox* mLabelRotation;
LLSpinCtrl* mCtrlRotX;
LLSpinCtrl* mCtrlRotY;
diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..63b4bd212739ec9a9c54b782beb31a7b70a63c73
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png
new file mode 100644
index 0000000000000000000000000000000000000000..4200182b0cec4c7ff7aea2bf60232207640aad9f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png
new file mode 100644
index 0000000000000000000000000000000000000000..e12887f4891a587ad029d994844bb9c0ac766022
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7325d836d28f105dfda4a91d9798cca917ef4a0c..b7fa1e72f8efe8389f59030110fed6436cf27aad 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -438,6 +438,10 @@ with the same filename but different name
<texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="false" />
<texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="false" />
+ <texture name="ClipboardSmallMenu_Disabled" file_name="icons/ClipboardSmallMenu_Disabled.png" preload="false" />
+ <texture name="ClipboardSmallMenu_Off" file_name="icons/ClipboardSmallMenu_Off.png" preload="false" />
+ <texture name="ClipboardSmallMenu_Press" file_name="icons/ClipboardSmallMenu_Press.png" preload="false" />
+
<texture name="OutboxStatus_Success" file_name="green_checkmark.png" preload="false" />
<texture name="OutboxStatus_Warning" file_name="icons/pop_up_caution.png" preload="false" />
<texture name="OutboxStatus_Error" file_name="red_x.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 2397be6b6106f6c54ce923a5c50233ab46246ec9..7768f894b856964f95c4a367ab83a53708e54aee 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1430,19 +1430,29 @@ even though the user gets a free copy.
tool_tip="Causes object to not collide with other objects or avatars"
top_pad="0"
width="123" />
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left_delta="0"
+ name="lod_tab_border"
+ top_pad="10"
+ width="95" />
<menu_button
menu_filename="menu_copy_paste_pos.xml"
follows="top|left"
height="11"
- image_disabled="OptionsMenu_Disabled"
- image_selected="OptionsMenu_Press"
- image_unselected="OptionsMenu_Off"
+ image_disabled="ClipboardSmallMenu_Disabled"
+ image_selected="ClipboardSmallMenu_Press"
+ image_unselected="ClipboardSmallMenu_Off"
layout="topleft"
- top_pad="10"
- name="paste_pos_btn"
+ left_delta="0"
+ top_pad="13"
+ name="clipboard_pos_btn"
tool_tip="Paste options"
width="19"/>
- <text
+ <text
type="string"
length="1"
follows="left|top"
@@ -1468,7 +1478,7 @@ even though the user gets a free copy.
min_val="-256"
name="Pos X"
text_enabled_color="1 0 0.3 .7"
- top_pad="5"
+ top_pad="8"
width="87" />
<spinner
follows="left|top"
@@ -1503,13 +1513,13 @@ even though the user gets a free copy.
menu_filename="menu_copy_paste_size.xml"
follows="top|left"
height="11"
- image_disabled="OptionsMenu_Disabled"
- image_selected="OptionsMenu_Press"
- image_unselected="OptionsMenu_Off"
+ image_disabled="ClipboardSmallMenu_Disabled"
+ image_selected="ClipboardSmallMenu_Press"
+ image_unselected="ClipboardSmallMenu_Off"
layout="topleft"
left_delta="0"
- top_pad="10"
- name="paste_size_btn"
+ top_pad="13"
+ name="clipboard_size_btn"
tool_tip="Paste options"
width="19"/>
<text
@@ -1538,7 +1548,7 @@ even though the user gets a free copy.
min_val="0.01"
name="Scale X"
text_enabled_color="1 1 1 1"
- top_pad="5"
+ top_pad="8"
width="87" />
<spinner
follows="left|top"
@@ -1574,13 +1584,13 @@ even though the user gets a free copy.
menu_filename="menu_copy_paste_rot.xml"
follows="top|left"
height="11"
- image_disabled="OptionsMenu_Disabled"
- image_selected="OptionsMenu_Press"
- image_unselected="OptionsMenu_Off"
+ image_disabled="ClipboardSmallMenu_Disabled"
+ image_selected="ClipboardSmallMenu_Press"
+ image_unselected="ClipboardSmallMenu_Off"
layout="topleft"
left_delta="0"
- top_pad="10"
- name="paste_rot_btn"
+ top_pad="13"
+ name="clipboard_rot_btn"
tool_tip="Paste options"
width="19"/>
<text
@@ -1610,7 +1620,7 @@ even though the user gets a free copy.
min_val="-9999"
name="Rot X"
text_enabled_color="1 1 1 1"
- top_pad="5"
+ top_pad="8"
width="87" />
<spinner
decimal_digits="2"