diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index aad8c5cf854399e839c82a90243a777f3142aced..c28408d5664efcfb33d9b8147cdc9954c470a80a 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -238,7 +238,8 @@ BOOL LLFloaterTools::postBuild()
mBtnEdit = getChild<LLButton>("button edit");
mBtnCreate = getChild<LLButton>("button create");
mBtnLand = getChild<LLButton>("button land" );
- mTextStatus = getChild<LLTextBox>("text status");
+ //BD
+ //mTextStatus = getChild<LLTextBox>("text status");
mRadioGroupFocus = getChild<LLRadioGroup>("focus_radio_group");
mRadioGroupMove = getChild<LLRadioGroup>("move_radio_group");
mRadioGroupEdit = getChild<LLRadioGroup>("edit_radio_group");
@@ -327,7 +328,8 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
mBtnEdit(NULL),
mBtnCreate(NULL),
mBtnLand(NULL),
- mTextStatus(NULL),
+ //BD
+ //mTextStatus(NULL),
mRadioGroupFocus(NULL),
mRadioGroupMove(NULL),
@@ -424,7 +426,8 @@ LLFloaterTools::~LLFloaterTools()
delete mLandImpactsObserver;
}
-void LLFloaterTools::setStatusText(const std::string& text)
+//BD
+/*void LLFloaterTools::setStatusText(const std::string& text)
{
std::map<std::string, std::string>::iterator iter = mStatusText.find(text);
if (iter != mStatusText.end())
@@ -435,7 +438,7 @@ void LLFloaterTools::setStatusText(const std::string& text)
{
mTextStatus->setText(text);
}
-}
+}*/
void LLFloaterTools::refresh()
{
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index 7bd5e4cba2105302fa157d41e4ca931ce88a2f68..75e988da2f3770a94e7469835932e6ee83b35123 100644
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -105,7 +105,8 @@ void LLManipRotate::handleSelect()
{
// *FIX: put this in mouseDown?
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
- gFloaterTools->setStatusText("rotate");
+ //BD
+ //gFloaterTools->setStatusText("rotate");
LLManip::handleSelect();
}
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 8b2ac4f303eaed9f7879e9afeda0be9d726bb2d0..7049cdf6eb9957a36fd487123f074305d5cf2448 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -170,7 +170,8 @@ void LLManipScale::handleSelect()
LLBBox bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
updateSnapGuides(bbox);
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
- gFloaterTools->setStatusText("scale");
+ //BD
+ //gFloaterTools->setStatusText("scale");
LLManip::handleSelect();
}
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index 9a668c3c12fc3eb57716a5dd8c7c1a922998d4d7..1dead50ae011deaed66b5661e496d90b5e006d24 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -290,7 +290,8 @@ LLManipTranslate::~LLManipTranslate()
void LLManipTranslate::handleSelect()
{
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
- gFloaterTools->setStatusText("move");
+ //BD
+ //gFloaterTools->setStatusText("move");
LLManip::handleSelect();
}
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index c028658335e29d4052ce496e289339950e10f0d9..28a0da3fcce07e01b1af69640ab2b4c1054a4b7b 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -159,8 +159,9 @@ BOOL LLPanelGroup::postBuild()
button = getChild<LLButton>("btn_chat");
button->setClickedCallback(onBtnGroupChatClicked, this);
- button = getChild<LLButton>("btn_cancel");
- button->setVisible(false); button->setEnabled(true);
+ //BD
+ //button = getChild<LLButton>("btn_cancel");
+ //button->setVisible(false); button->setEnabled(true);
button = getChild<LLButton>("btn_refresh");
button->setClickedCallback(onBtnRefresh, this);
@@ -216,21 +217,26 @@ void LLPanelGroup::reposButton(const std::string& name)
void LLPanelGroup::reposButtons()
{
LLButton* button_refresh = findChild<LLButton>("btn_refresh");
- LLButton* button_cancel = findChild<LLButton>("btn_cancel");
+ //BD
+ //LLButton* button_cancel = findChild<LLButton>("btn_cancel");
- if(button_refresh && button_cancel && button_refresh->getVisible() && button_cancel->getVisible())
+ //BD
+ //if(button_refresh && button_cancel && button_refresh->getVisible() && button_cancel->getVisible())
+ if (button_refresh && button_refresh->getVisible())
{
LLRect btn_refresh_rect = button_refresh->getRect();
- LLRect btn_cancel_rect = button_cancel->getRect();
- btn_refresh_rect.setLeftTopAndSize( btn_cancel_rect.mLeft + btn_cancel_rect.getWidth() + 2,
- btn_refresh_rect.getHeight() + 2, btn_refresh_rect.getWidth(), btn_refresh_rect.getHeight());
+ //BD
+ //LLRect btn_cancel_rect = button_cancel->getRect();
+ //btn_refresh_rect.setLeftTopAndSize( btn_cancel_rect.mLeft + btn_cancel_rect.getWidth() + 2,
+ // btn_refresh_rect.getHeight() + 2, btn_refresh_rect.getWidth(), btn_refresh_rect.getHeight());
button_refresh->setRect(btn_refresh_rect);
}
reposButton("btn_apply");
reposButton("btn_create");
reposButton("btn_refresh");
- reposButton("btn_cancel");
+ //BD
+ //reposButton("btn_cancel");
reposButton("btn_chat");
reposButton("btn_call");
}
@@ -393,7 +399,8 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
LLButton* button_refresh = findChild<LLButton>("btn_refresh");
LLButton* button_create = findChild<LLButton>("btn_create");
- LLButton* button_cancel = findChild<LLButton>("btn_cancel");
+ //BD
+ //LLButton* button_cancel = findChild<LLButton>("btn_cancel");
LLButton* button_call = findChild<LLButton>("btn_call");
LLButton* button_chat = findChild<LLButton>("btn_chat");
//BD
@@ -411,8 +418,9 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
if(button_create)
button_create->setVisible(is_null_group_id);
- if(button_cancel)
- button_cancel->setVisible(!is_null_group_id);
+ //BD
+ //if(button_cancel)
+ // button_cancel->setVisible(!is_null_group_id);
if(button_call)
button_call->setVisible(!is_null_group_id);
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index cb3a18bb0037f27145510a57a8da8bb68434bf5f..01b58df48bab9d02601fae41f0fa4170bfef520b 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -617,7 +617,8 @@ BOOL LLPanelPeople::postBuild()
mRecentAddBtn = getChild<LLUICtrl>("recent_add_friend_btn");
mRecentGearBtn = getChild<LLUICtrl>("recent_gear_btn");
mBlockedGearBtn = getChild<LLUICtrl>("blocked_gear_btn");
- mGroupMinusBtn = getChild<LLUICtrl>("minus_btn");
+ //BD
+ //mGroupMinusBtn = getChild<LLUICtrl>("minus_btn");
mTabContainer = getChild<LLTabContainer>("tabs");
mTabContainer->setCommitCallback(boost::bind(&LLPanelPeople::onTabSelected, this, _2));
@@ -1337,7 +1338,7 @@ bool LLPanelPeople::isItemsFreeOfFriends(const uuid_vec_t& uuids)
void LLPanelPeople::onAddFriendWizButtonClicked()
{
LLPanel* cur_panel = mTabContainer->getCurrentPanel();
- LLView * button = cur_panel->findChild<LLButton>("friends_add_btn", TRUE);
+ LLView * button = cur_panel->findChild<LLButton>("add_friend_btn", TRUE);
// Show add friend wizard.
LLFloater* root_floater = gFloaterView->getParentFloater(this);
diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp
index 0a0bfaf58bbe7e27d94a1096a2d86e1b7216bb11..6b0c7b419d69c128b3ed13d523b2e78d1657e527 100644
--- a/indra/newview/lltoolbrush.cpp
+++ b/indra/newview/lltoolbrush.cpp
@@ -447,7 +447,8 @@ void LLToolBrushLand::handleSelect()
{
gEditMenuHandler = this;
- gFloaterTools->setStatusText("modifyland");
+ //BD
+ //gFloaterTools->setStatusText("modifyland");
// if (!mBrushSelected)
{
mBrushSelected = TRUE;
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index 6c2b46b207f89526fe146decef7bc30c47b9e556..ce8501b51a6d3409d72f77271523a51f5da85314 100644
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -102,7 +102,8 @@ void LLToolCamera::handleSelect()
{
if (gFloaterTools)
{
- gFloaterTools->setStatusText("camera");
+ //BD
+ //gFloaterTools->setStatusText("camera");
// in case we start from tools floater, we count any selection as valid
mValidSelection = gFloaterTools->getVisible();
}
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
index 376599ab0badf808b18bbbeb0045120dbb289da5..cf45e6cd3baf5b62e288355f0817e75835dfb40e 100644
--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -101,7 +101,8 @@ void LLToolGrabBase::handleSelect()
if(gFloaterTools)
{
// viewer can crash during startup if we don't check.
- gFloaterTools->setStatusText("grab");
+ //BD
+ //gFloaterTools->setStatusText("grab");
// in case we start from tools floater, we count any selection as valid
mValidSelection = gFloaterTools->getVisible();
}
diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp
index ea819811ef2d339dd78cf5a33dd209e9f344d3a8..e46369c72c83e728c2670e4834be91b67b94ef79 100644
--- a/indra/newview/lltoolplacer.cpp
+++ b/indra/newview/lltoolplacer.cpp
@@ -549,7 +549,8 @@ BOOL LLToolPlacer::handleHover(S32 x, S32 y, MASK mask)
void LLToolPlacer::handleSelect()
{
- gFloaterTools->setStatusText("place");
+ //BD
+ //gFloaterTools->setStatusText("place");
}
void LLToolPlacer::handleDeselect()
diff --git a/indra/newview/lltoolselectland.cpp b/indra/newview/lltoolselectland.cpp
index ff991dc9fd62ba29714e9e68340155adb202e432..675a38d2edfde1cfbe840e327d30f3bd0ed056d7 100644
--- a/indra/newview/lltoolselectland.cpp
+++ b/indra/newview/lltoolselectland.cpp
@@ -207,7 +207,8 @@ void LLToolSelectLand::render()
void LLToolSelectLand::handleSelect()
{
- gFloaterTools->setStatusText("selectland");
+ //BD
+ //gFloaterTools->setStatusText("selectland");
}
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index b374e7affd738de9d34ea15a359498b73ccd59dd..0265061ebc076979777ec8e876b2fdce97e187fe 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -721,12 +721,12 @@ with the same filename but different name
<texture name="ComboToolbarButton_Disabled" file_name="widgets/ComboToolbarButton_Disabled.png" preload="false" scale.left="19" scale.top="19" scale.right="22" scale.bottom="2" />
<texture name="ComboToolbarButton_Selected" file_name="widgets/ComboToolbarButton_Selected.png" preload="true" scale.left="19" scale.top="19" scale.right="22" scale.bottom="2" />
- <texture name="ComboToolbarButton_UpSelected" file_name="widgets/ComboToolbarButton_UpSelected.png" preload="false" scale.left="19" scale.top="19" scale.right="22" scale.bottom="2" />
+ <!--<texture name="ComboToolbarButton_UpSelected" file_name="widgets/ComboToolbarButton_UpSelected.png" preload="false" scale.left="19" scale.top="19" scale.right="22" scale.bottom="2" />-->
<texture name="ComboToolbarButton_On" file_name="widgets/ComboToolbarButton_On.png" preload="false" scale.left="19" scale.top="19" scale.right="22" scale.bottom="2" />
<texture name="ComboToolbarButton_Off" file_name="widgets/ComboToolbarButton_Off.png" preload="true" scale.left="19" scale.top="19" scale.right="22" scale.bottom="2" />
<texture name="ComboToolbarButton_UpOff" file_name="widgets/ComboToolbarButton_UpOff.png" preload="false" scale.left="19" scale.top="19" scale.right="22" scale.bottom="2" />
- <texture name="Rounded_Rect" file_name="Name_Rect.png" preload="true" scale.left="6" scale.top="26" scale.right="58" scale.bottom="6" />
+ <texture name="Name_Rect" file_name="Name_Rect.png" preload="true" scale.left="6" scale.top="26" scale.right="58" scale.bottom="6" />
<!--<texture name="Rounded_Rect_Top" file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="8" scale.right="58" scale.bottom="0" clip.left="0" clip.right="64" clip.bottom="16" clip.top="32" />-->
<texture name="Prefs_Separator" file_name="widgets/prefs_separator.png"/>
diff --git a/indra/newview/skins/default/xui/en/floater_grid_status.xml b/indra/newview/skins/default/xui/en/floater_grid_status.xml
index b97bd8056dc5e347707c332e61bd5e572a15309d..bf782042824b56651d6bdf8b922079368e63b93b 100644
--- a/indra/newview/skins/default/xui/en/floater_grid_status.xml
+++ b/indra/newview/skins/default/xui/en/floater_grid_status.xml
@@ -12,7 +12,6 @@
save_rect="true"
save_visibility="true"
title=""
- initial_mime_type="text/html"
width="780"
tab_stop="true"
filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 5b16646635aacafadc46d6bc18f247ed31c88a99..d7564ebe5cefbe9350e636dc4c0bb62e450fb5b3 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -380,7 +380,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="1"
- name="friends_add_btn"
+ name="add_friend_btn"
tool_tip="Offer friendship to a resident"
top_delta="0"
width="31">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index af368a10e175f89d7f4eb6e15ca809f6658915e6..915cf013a38e4856a61cc89391583d9ff47b093c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -151,10 +151,7 @@ width="510">
left="10"
name="FullscreenWindow"
top_pad="15"
- width="115" >
- <check_box.commit_callback
- function="Pref.FullscreenWindow"/>
- </check_box>
+ width="115" />
<text
type="string"
length="1"