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

EXT-7729 WIP LLWARNS: Tons of "Making dummy class..." warnings on startup 

reviewed by Leyla
master
Richard Linden 2010-06-22 13:42:55 -07:00
parent a42cf03807
commit 7a54ce3cf6
38 changed files with 118 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llfloater.cpp
View File

@ -2754,10 +2754,10 @@ void LLFloater::initFromParams(const LLFloater::Params& p)
LLFastTimer::DeclareTimer POST_BUILD("Floater Post Build");
bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)
bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node)
{
Params params(LLUICtrlFactory::getDefaultParams<LLFloater>());
LLXUIParser::instance().readXUI(node, params); // *TODO: Error checking
LLXUIParser::instance().readXUI(node, params, filename); // *TODO: Error checking
if (output_node)
{

2
indra/llui/llfloater.h
View File

@ -149,7 +149,7 @@ public:
static void setupParamsForExport(Params& p, LLView* parent);
void initFromParams(const LLFloater::Params& p);
bool initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL);
bool initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node = NULL);
/*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false);
/*virtual*/ BOOL canSnapTo(const LLView* other_view);

2
indra/llui/lluictrlfactory.cpp
View File

@ -222,7 +222,7 @@ bool LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filen
floaterp->getCommitCallbackRegistrar().pushScope();
floaterp->getEnableCallbackRegistrar().pushScope();
res = floaterp->initFloaterXML(root, floaterp->getParent(), output_node);
res = floaterp->initFloaterXML(root, floaterp->getParent(), filename, output_node);
floaterp->setXMLFilename(filename);

2
indra/llui/llview.cpp
View File

@ -111,6 +111,8 @@ LLView::Params::Params()
user_resize("user_resize"),
auto_resize("auto_resize"),
needs_translate("translate"),
min_width("min_width"),
max_width("max_width"),
xmlns("xmlns"),
xmlns_xsi("xmlns:xsi"),
xsi_schemaLocation("xsi:schemaLocation"),

4
indra/llui/llview.h
View File

@ -148,6 +148,8 @@ public:
Ignored user_resize,
auto_resize,
needs_translate,
min_width,
max_width,
xmlns,
xmlns_xsi,
xsi_schemaLocation,
@ -634,7 +636,7 @@ template <class T> T* LLView::getChild(const std::string& name, BOOL recurse) co
// did we find *something* with that name?
if (child)
{
llwarns << "Found child named " << name << " but of wrong type " << typeid(*child).name() << ", expecting " << typeid(T*).name() << llendl;
llwarns << "Found child named \"" << name << "\" but of wrong type " << typeid(*child).name() << ", expecting " << typeid(T*).name() << llendl;
}
result = getDefaultWidget<T>(name);
if (!result)

13
indra/newview/llfloaterpreference.cpp
View File

@ -70,6 +70,7 @@
#include "llscrolllistctrl.h"
#include "llscrolllistitem.h"
#include "llsliderctrl.h"
#include "llsidetray.h"
#include "lltabcontainer.h"
#include "lltrans.h"
#include "llviewercontrol.h"
@ -309,6 +310,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar.add("Pref.applyUIColor", boost::bind(&LLFloaterPreference::applyUIColor, this ,_1, _2));
mCommitCallbackRegistrar.add("Pref.getUIColor", boost::bind(&LLFloaterPreference::getUIColor, this ,_1, _2));
mCommitCallbackRegistrar.add("Pref.MaturitySettings", boost::bind(&LLFloaterPreference::onChangeMaturity, this));
mCommitCallbackRegistrar.add("Pref.BlockList", boost::bind(&LLFloaterPreference::onClickBlockList, this));
sSkin = gSavedSettings.getString("SkinCurrent");
}
@ -1225,6 +1227,17 @@ void LLFloaterPreference::onChangeMaturity()
getChild<LLIconCtrl>("rating_icon_adult")->setVisible(sim_access == SIM_ACCESS_ADULT);
}
// FIXME: this will stop you from spawning the sidetray from preferences dialog on login screen
// but the UI for this will still be enabled
void LLFloaterPreference::onClickBlockList()
{
// don't create side tray on demand
if (LLSideTray::instanceCreated())
{
LLSideTray::getInstance()->showPanel("panel_block_list_sidetray");
}
}
void LLFloaterPreference::applyUIColor(LLUICtrl* ctrl, const LLSD& param)
{

1
indra/newview/llfloaterpreference.h
View File

@ -141,6 +141,7 @@ public:
void onCommitMusicEnabled();
void applyResolution();
void onChangeMaturity();
void onClickBlockList();
void applyUIColor(LLUICtrl* ctrl, const LLSD& param);
void getUIColor(LLUICtrl* ctrl, const LLSD& param);

4
indra/newview/llfloatertools.cpp
View File

@ -235,7 +235,6 @@ BOOL LLFloaterTools::postBuild()
childSetValue("checkbox uniform",(BOOL)gSavedSettings.getBOOL("ScaleUniform"));
mCheckStretchTexture = getChild<LLCheckBoxCtrl>("checkbox stretch textures");
childSetValue("checkbox stretch textures",(BOOL)gSavedSettings.getBOOL("ScaleStretchTextures"));
mTextGridMode = getChild<LLTextBox>("text ruler mode");
mComboGridMode = getChild<LLComboBox>("combobox grid mode");
mCheckStretchUniformLabel = getChild<LLTextBox>("checkbox uniform label");
@ -313,7 +312,6 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
mCheckSnapToGrid(NULL),
mBtnGridOptions(NULL),
mTitleMedia(NULL),
mTextGridMode(NULL),
mComboGridMode(NULL),
mCheckStretchUniform(NULL),
mCheckStretchTexture(NULL),
@ -625,8 +623,6 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
mComboGridMode->setCurrentByIndex(index);
}
if (mTextGridMode) mTextGridMode->setVisible( edit_visible );
// Snap to grid disabled for grab tool - very confusing
if (mCheckSnapToGrid) mCheckSnapToGrid->setVisible( edit_visible /* || tool == LLToolGrab::getInstance() */ );
if (mBtnGridOptions) mBtnGridOptions->setVisible( edit_visible /* || tool == LLToolGrab::getInstance() */ );

1
indra/newview/llfloatertools.h
View File

@ -144,7 +144,6 @@ public:
LLCheckBoxCtrl* mCheckSnapToGrid;
LLButton* mBtnGridOptions;
LLTextBox* mTextGridMode;
LLComboBox* mComboGridMode;
LLCheckBoxCtrl* mCheckStretchUniform;
LLCheckBoxCtrl* mCheckStretchTexture;

32
indra/newview/llfloaterworldmap.cpp
View File

@ -56,7 +56,7 @@
#include "llinventorymodelbackgroundfetch.h"
#include "llinventoryobserver.h"
#include "lllandmarklist.h"
#include "lllineeditor.h"
#include "llsearcheditor.h"
#include "llnotificationsutil.h"
#include "llregionhandle.h"
#include "llscrolllistctrl.h"
@ -229,30 +229,20 @@ BOOL LLFloaterWorldMap::postBuild()
mPanel = getChild<LLPanel>("objects_mapview");
LLComboBox *avatar_combo = getChild<LLComboBox>("friend combo");
if (avatar_combo)
{
avatar_combo->selectFirstItem();
avatar_combo->setPrearrangeCallback( boost::bind(&LLFloaterWorldMap::onAvatarComboPrearrange, this) );
avatar_combo->setTextEntryCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) );
}
avatar_combo->selectFirstItem();
avatar_combo->setPrearrangeCallback( boost::bind(&LLFloaterWorldMap::onAvatarComboPrearrange, this) );
avatar_combo->setTextEntryCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) );
getChild<LLScrollListCtrl>("location")->setFocusChangedCallback(boost::bind(&LLFloaterWorldMap::onLocationFocusChanged, this, _1));
LLLineEditor *location_editor = getChild<LLLineEditor>("location");
if (location_editor)
{
location_editor->setKeystrokeCallback( boost::bind(&LLFloaterWorldMap::onSearchTextEntry, this, _1), NULL );
}
LLSearchEditor *location_editor = getChild<LLSearchEditor>("location");
location_editor->setFocusChangedCallback(boost::bind(&LLFloaterWorldMap::onLocationFocusChanged, this, _1));
location_editor->setKeystrokeCallback( boost::bind(&LLFloaterWorldMap::onSearchTextEntry, this));
getChild<LLScrollListCtrl>("search_results")->setDoubleClickCallback( boost::bind(&LLFloaterWorldMap::onClickTeleportBtn, this));
LLComboBox *landmark_combo = getChild<LLComboBox>( "landmark combo");
if (landmark_combo)
{
landmark_combo->selectFirstItem();
landmark_combo->setPrearrangeCallback( boost::bind(&LLFloaterWorldMap::onLandmarkComboPrearrange, this) );
landmark_combo->setTextEntryCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) );
}
landmark_combo->selectFirstItem();
landmark_combo->setPrearrangeCallback( boost::bind(&LLFloaterWorldMap::onLandmarkComboPrearrange, this) );
landmark_combo->setTextEntryCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) );
mCurZoomVal = log(LLWorldMapView::sMapScale)/log(2.f);
childSetValue("zoom slider", LLWorldMapView::sMapScale);
@ -1003,7 +993,7 @@ void LLFloaterWorldMap::onComboTextEntry()
LLTracker::clearFocus();
}
void LLFloaterWorldMap::onSearchTextEntry( LLLineEditor* ctrl )
void LLFloaterWorldMap::onSearchTextEntry( )
{
onComboTextEntry();
updateSearchEnabled();

2
indra/newview/llfloaterworldmap.h
View File

@ -123,7 +123,7 @@ protected:
void onAvatarComboCommit();
void onComboTextEntry( );
void onSearchTextEntry( LLLineEditor* ctrl );
void onSearchTextEntry( );
void onClearBtn();
void onClickTeleportBtn();

45
indra/newview/llpanelavatar.cpp
View File

@ -843,9 +843,6 @@ BOOL LLPanelMyProfile::postBuild()
{
LLPanelAvatarProfile::postBuild();
mStatusCombobox = getChild<LLComboBox>("status_combo");
childSetCommitCallback("status_combo", boost::bind(&LLPanelMyProfile::onStatusChanged, this), NULL);
childSetCommitCallback("status_me_message_text", boost::bind(&LLPanelMyProfile::onStatusMessageChanged, this), NULL);
resetControls();
@ -865,30 +862,9 @@ void LLPanelMyProfile::processProfileProperties(const LLAvatarData* avatar_data)
fillPartnerData(avatar_data);
fillStatusData(avatar_data);
fillAccountStatus(avatar_data);
}
void LLPanelMyProfile::fillStatusData(const LLAvatarData* avatar_data)
{
std::string status;
if (gAgent.getAFK())
{
status = "away";
}
else if (gAgent.getBusy())
{
status = "busy";
}
else
{
status = "online";
}
mStatusCombobox->setValue(status);
}
void LLPanelMyProfile::resetControls()
{
childSetVisible("status_panel", false);
@ -899,27 +875,6 @@ void LLPanelMyProfile::resetControls()
childSetVisible("profile_me_buttons_panel", true);
}
void LLPanelMyProfile::onStatusChanged()
{
LLSD::String status = mStatusCombobox->getValue().asString();
if ("online" == status)
{
gAgent.clearAFK();
gAgent.clearBusy();
}
else if ("away" == status)
{
gAgent.clearBusy();
gAgent.setAFK();
}
else if ("busy" == status)
{
gAgent.clearAFK();
gAgent.setBusy();
LLNotificationsUtil::add("BusyModeSet");
}
}
void LLPanelMyProfile::onStatusMessageChanged()
{

11
indra/newview/llpanelavatar.h
View File

@ -240,21 +240,10 @@ protected:
/*virtual*/ void processProfileProperties(const LLAvatarData* avatar_data);
/**
* Fills Avatar status data.
*/
virtual void fillStatusData(const LLAvatarData* avatar_data);
/*virtual*/ void resetControls();
protected:
void onStatusChanged();
void onStatusMessageChanged();
private:
LLComboBox* mStatusCombobox;
};
/**

4
indra/newview/llpanelnearbymedia.cpp
View File

@ -224,8 +224,8 @@ void LLPanelNearByMedia::reshape(S32 width, S32 height, BOOL called_from_parent)
{
LLPanel::reshape(width, height, called_from_parent);
LLButton* more_less_btn = getChild<LLButton>("more_less_btn");
if (more_less_btn->getValue().asBoolean())
LLButton* more_btn = getChild<LLButton>("more_btn");
if (more_btn->getValue().asBoolean())
{
mMoreRect = getRect();
}

7
indra/newview/llpanelobject.cpp
View File

@ -172,7 +172,6 @@ BOOL LLPanelObject::postBuild()
//--------------------------------------------------------
// material type popup
mLabelMaterial = getChild<LLTextBox>("label material");
mComboMaterial = getChild<LLComboBox>("material");
childSetCommitCallback("material",onCommitMaterial,this);
mComboMaterial->removeall();
@ -189,7 +188,6 @@ BOOL LLPanelObject::postBuild()
mComboMaterialItemCount = mComboMaterial->getItemCount();
// Base Type
mLabelBaseType = getChild<LLTextBox>("label basetype");
mComboBaseType = getChild<LLComboBox>("comboBaseType");
childSetCommitCallback("comboBaseType",onCommitParametric,this);
@ -548,7 +546,6 @@ void LLPanelObject::getState( )
if (editable && single_volume && material_same)
{
mComboMaterial->setEnabled( TRUE );
mLabelMaterial->setEnabled( TRUE );
if (material_code == LL_MCODE_LIGHT)
{
if (mComboMaterial->getItemCount() == mComboMaterialItemCount)
@ -570,7 +567,6 @@ void LLPanelObject::getState( )
else
{
mComboMaterial->setEnabled( FALSE );
mLabelMaterial->setEnabled( FALSE );
}
//----------------------------------------------------------------------------
@ -979,7 +975,6 @@ void LLPanelObject::getState( )
}
// Update field enablement
mLabelBaseType ->setEnabled( enabled );
mComboBaseType ->setEnabled( enabled );
mLabelCut ->setEnabled( enabled );
@ -1910,12 +1905,10 @@ void LLPanelObject::clearCtrls()
mCheckCastShadows->setEnabled( FALSE );
#endif
mComboMaterial ->setEnabled( FALSE );
mLabelMaterial ->setEnabled( FALSE );
// Disable text labels
mLabelPosition ->setEnabled( FALSE );
mLabelSize ->setEnabled( FALSE );
mLabelRotation ->setEnabled( FALSE );
mLabelBaseType ->setEnabled( FALSE );
mLabelCut ->setEnabled( FALSE );
mLabelHollow ->setEnabled( FALSE );
mLabelHoleType ->setEnabled( FALSE );

2
indra/newview/llpanelobject.h
View File

@ -101,11 +101,9 @@ protected:
protected:
S32 mComboMaterialItemCount;
LLTextBox* mLabelMaterial;
LLComboBox* mComboMaterial;
// Per-object options
LLTextBox* mLabelBaseType;
LLComboBox* mComboBaseType;
LLTextBox* mLabelCut;

4
indra/newview/llpanelvolumepulldown.cpp
View File

@ -44,7 +44,7 @@
#include "lltabcontainer.h"
#include "llfloaterreg.h"
#include "llfloaterpreference.h"
#include "llslider.h"
#include "llsliderctrl.h"
/* static */ const F32 LLPanelVolumePulldown::sAutoCloseFadeStartTimeSec = 4.0f;
/* static */ const F32 LLPanelVolumePulldown::sAutoCloseTotalTimeSec = 5.0f;
@ -66,7 +66,7 @@ LLPanelVolumePulldown::LLPanelVolumePulldown()
BOOL LLPanelVolumePulldown::postBuild()
{
// set the initial volume-slider's position to reflect reality
LLSlider* volslider = getChild<LLSlider>( "mastervolume" );
LLSliderCtrl* volslider = getChild<LLSliderCtrl>( "mastervolume" );
volslider->setValue(gSavedSettings.getF32("AudioLevelMaster"));
return LLPanel::postBuild();

8
indra/newview/llsidepaneliteminfo.cpp
View File

@ -131,7 +131,6 @@ BOOL LLSidepanelItemInfo::postBuild()
getChild<LLUICtrl>("CheckNextOwnerTransfer")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitPermissions, this));
// Mark for sale or not, and sale info
getChild<LLUICtrl>("CheckPurchase")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitSaleInfo, this));
getChild<LLUICtrl>("RadioSaleType")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitSaleType, this));
// "Price" label for edit
getChild<LLUICtrl>("Edit Cost")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitSaleInfo, this));
refresh();
@ -189,7 +188,6 @@ void LLSidepanelItemInfo::refresh()
"CheckNextOwnerCopy",
"CheckNextOwnerTransfer",
"CheckPurchase",
"RadioSaleType",
"Edit Cost"
};
@ -364,7 +362,6 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
"CheckNextOwnerTransfer",
"CheckPurchase",
"SaleLabel",
"RadioSaleType",
"combobox sale copy",
"Edit Cost",
"TextPrice"
@ -559,7 +556,6 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
childSetEnabled("CheckNextOwnerCopy",(base_mask & PERM_COPY) && !cannot_restrict_permissions);
childSetEnabled("CheckNextOwnerTransfer",(next_owner_mask & PERM_COPY) && !cannot_restrict_permissions);
childSetEnabled("RadioSaleType",is_complete && is_for_sale);
childSetEnabled("TextPrice",is_complete && is_for_sale);
childSetEnabled("Edit Cost",is_complete && is_for_sale);
}
@ -573,7 +569,6 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
childSetEnabled("CheckNextOwnerCopy",FALSE);
childSetEnabled("CheckNextOwnerTransfer",FALSE);
childSetEnabled("RadioSaleType",FALSE);
childSetEnabled("TextPrice",FALSE);
childSetEnabled("Edit Cost",FALSE);
}
@ -586,17 +581,14 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
childSetValue("CheckNextOwnerCopy",LLSD(BOOL(next_owner_mask & PERM_COPY)));
childSetValue("CheckNextOwnerTransfer",LLSD(BOOL(next_owner_mask & PERM_TRANSFER)));
LLRadioGroup* radioSaleType = getChild<LLRadioGroup>("RadioSaleType");
if (is_for_sale)
{
radioSaleType->setSelectedIndex((S32)sale_info.getSaleType() - 1);
S32 numerical_price;
numerical_price = sale_info.getSalePrice();
childSetText("Edit Cost",llformat("%d",numerical_price));
}
else
{
radioSaleType->setSelectedIndex(-1);
childSetText("Edit Cost",llformat("%d",0));
}
}

2
indra/newview/llstatusbar.cpp
View File

@ -184,8 +184,6 @@ BOOL LLStatusBar::postBuild()
mTextHealth = getChild<LLTextBox>("HealthText" );
mTextTime = getChild<LLTextBox>("TimeText" );
getChild<LLUICtrl>("buycurrency")->setCommitCallback(
boost::bind(&LLStatusBar::onClickBuyCurrency, this));
getChild<LLUICtrl>("buyL")->setCommitCallback(
boost::bind(&LLStatusBar::onClickBuyCurrency, this));

1
indra/newview/llwearabletype.cpp
View File

@ -85,7 +85,6 @@ LLWearableDictionary::LLWearableDictionary()
addEntry(LLWearableType::WT_TATTOO, new WearableEntry("tattoo", "New Tattoo", LLAssetType::AT_CLOTHING, LLInventoryIcon::ICONNAME_CLOTHING_TATTOO));
addEntry(LLWearableType::WT_INVALID, new WearableEntry("invalid", "Invalid Wearable", LLAssetType::AT_NONE, LLInventoryIcon::ICONNAME_NONE));
addEntry(LLWearableType::WT_NONE, new WearableEntry("none", "Invalid Wearable", LLAssetType::AT_NONE, LLInventoryIcon::ICONNAME_NONE));
addEntry(LLWearableType::WT_COUNT, new WearableEntry("count", "Invalid Wearable", LLAssetType::AT_NONE, LLInventoryIcon::ICONNAME_NONE));
}
// static

4
indra/newview/skins/default/textures/textures.xml
View File

@ -579,6 +579,10 @@ with the same filename but different name
<texture name="scrollbutton_left_in_blue.tga" file_name="widgets/ScrollArrow_Left_Over_Opaque.png" />
<texture name="scrollbutton_right_out_blue.tga" file_name="widgets/ScrollArrow_Right_Opaque.png" />
<texture name="scrollbutton_right_in_blue.tga" file_name="widgets/ScrollArrow_Right_Over_Opaque.png" />
<texture name="scrollbutton_up_out_blue.tga" file_name="widgets/ScrollArrow_Up_Opaque.png" />
<texture name="scrollbutton_up_in_blue.tga" file_name="widgets/ScrollArrow_Up_Over_Opaque.png" />
<texture name="scrollbutton_down_out_blue.tga" file_name="widgets/ScrollArrow_Down_Opaque.png" />
<texture name="scrollbutton_down_in_blue.tga" file_name="widgets/ScrollArrow_Down_Over_Opaque.png" />
<texture name="up_arrow.tga" file_name="up_arrow.png" />
<texture name="down_arrow.tga" file_name="down_arrow.png" />

BIN
indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 355 B

BIN
indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 315 B

BIN
indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 352 B

BIN
indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 329 B

2
indra/newview/skins/default/xui/en/alert_button.xml
View File

@ -5,7 +5,7 @@
label_shadow="true"
auto_resize="false"
image_overlay_alignment="center"
use_ellipses="flse"
use_ellipses="false"
pad_right="10"
pad_left="10"
is_toggle="false"

2
indra/newview/skins/default/xui/en/floater_event.xml
View File

@ -266,7 +266,6 @@
layout="topleft"
left="6"
name="create_event_btn"
picture_style="true"
tool_tip="Create Event"
width="18" />
<button
@ -280,7 +279,6 @@
left="6"
top_pad="-7"
name="god_delete_event_btn"
picture_style="true"
tool_tip="Delete Event"
width="18" />
<button

107
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -335,7 +335,6 @@
</combo_box>
<button
left_pad="0"
image_disabled="ForwardArrow_Disabled"
image_selected="ForwardArrow_Press"
image_unselected="ForwardArrow_Off"
layout="topleft"
@ -1012,7 +1011,7 @@
follows="left|top"
allow_text_entry="false"
height="23"
intial_value="2"
initial_value="2"
max_chars="20"
mouse_opaque="true"
name="sale type"
@ -2176,8 +2175,6 @@ even though the user gets a free copy.
width="60" />
<color_swatch
can_apply_immediately="true"
bevel_style="none"
border_style="line"
color="0.5 0.5 0.5 1"
border.border_thickness="0"
follows="left|top"
@ -2212,43 +2209,71 @@ even though the user gets a free copy.
name="Light Intensity"
top_pad="3"
width="128" />
<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
increment="0.1" initial_val="0.5" label="FOV" label_width="55"
left="144" max_val="3" min_val="0" mouse_opaque="true"
name="Light FOV" width="120" />
<spinner
follows="left|top"
height="19"
initial_value="5"
label="Radius"
label_width="70"
layout="topleft"
left="10"
max_val="20"
name="Light Radius"
top_pad="3"
width="128" />
<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
increment="0.5" initial_val="0.5" label="Focus" label_width="55"
left="144" max_val="20" min_val="-20" mouse_opaque="true"
name="Light Focus" width="120" />
<spinner
follows="left|top"
height="19"
increment="0.25"
initial_value="1"
label="Falloff"
label_width="70"
layout="topleft"
left="10"
max_val="2"
name="Light Falloff"
top_pad="3"
width="128" />
<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
increment="0.05" initial_val="1" label="Ambiance" label_width="55"
left="144" max_val="1" min_val="0" mouse_opaque="true"
name="Light Ambiance" width="120" />
<spinner bottom_delta="0"
decimal_digits="3"
follows="left|top"
height="16"
increment="0.1"
initial_value="0.5"
label="FOV"
label_width="55"
left="144"
max_val="3"
min_val="0"
mouse_opaque="true"
name="Light FOV"
width="120" />
<spinner follows="left|top"
height="19"
initial_value="5"
label="Radius"
label_width="70"
layout="topleft"
left="10"
max_val="20"
name="Light Radius"
top_pad="3"
width="128" />
<spinner bottom_delta="0"
decimal_digits="3"
follows="left|top"
height="16"
increment="0.5"
initial_value="0.5"
label="Focus"
label_width="55"
left="144"
max_val="20"
min_val="-20"
mouse_opaque="true"
name="Light Focus"
width="120" />
<spinner follows="left|top"
height="19"
increment="0.25"
initial_value="1"
label="Falloff"
label_width="70"
layout="topleft"
left="10"
max_val="2"
name="Light Falloff"
top_pad="3"
width="128" />
<spinner bottom_delta="0"
decimal_digits="3"
follows="left|top"
height="16"
increment="0.05"
initial_value="1"
label="Ambiance"
label_width="55"
left="144"
max_val="1"
min_val="0"
mouse_opaque="true"
name="Light Ambiance"
width="120" />
</panel>
<panel
border="false"

1
indra/newview/skins/default/xui/en/panel_classified_info.xml
View File

@ -46,7 +46,6 @@
image_unselected="BackButton_Off"
layout="topleft"
name="back_btn"
picture_style="true"
left="10"
tab_stop="false"
top="2"

1
indra/newview/skins/default/xui/en/panel_edit_classified.xml
View File

@ -30,7 +30,6 @@
image_unselected="BackButton_Off"
layout="topleft"
name="back_btn"
picture_style="true"
left="10"
tab_stop="false"
top="2"

4
indra/newview/skins/default/xui/en/panel_navigation_bar.xml
View File

@ -113,10 +113,6 @@
<!-- top_delta="0" -->
<!-- width="168" /> -->
<search_combo_box
bevel_style="none"
border_style="line"
border.border_thickness="0"
commit_on_focus_lost="false"
follows="right|top"
halign="right"
height="23"

3
indra/newview/skins/default/xui/en/panel_nearby_media.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
can_resize="true"
can_close="false"
bg_opaque_image="Volume_Background"
bg_alpha_image="Volume_Background"
background_opaque="true"
@ -58,7 +56,6 @@
top_delta="0"
left_pad="4"
height="22"
min_width="28"
width="28">
<button.commit_callback
function="MediaListCtrl.GoMediaPrefs" />

7
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
View File

@ -162,8 +162,9 @@
name="block_list"
top_pad="20"
width="145">
<button.commit_callback
function="SideTray.ShowPanel"
parameter="panel_block_list_sidetray" />
<!--<button.commit_callback
function="SideTray.ShowPanel"-->
<button.commit_callback
function="Pref.BlockList"/>
</button>
</panel>

1
indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
View File

@ -10,7 +10,6 @@
name="topinfo_bar"
width="1024">
<button
border="true"
follows="left|top"
height="16"
hover_glow_amount="0.15"

2
indra/newview/skins/default/xui/en/sidepanel_item_info.xml
View File

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
auto_tile="true"
height="570"
layout="topleft"
name="item properties"
help_topic="item_properties"
save_rect="true"
title="Object Profile"
width="333">
<panel.string

1
indra/newview/skins/default/xui/en/sidepanel_task_info.xml
View File

@ -219,7 +219,6 @@
left_pad="0"
top_delta="0"
name="button set group"
picture_style="true"
tab_stop="false"
tool_tip="Choose a group to share this object's permissions"
width="10" />

3
indra/newview/skins/default/xui/en/strings.xml
View File

@ -1812,7 +1812,8 @@ Clears (deletes) the media and all params from the given face.
<string name="skirt">Skirt</string>
<string name="alpha">Alpha</string>
<string name="tattoo">Tattoo</string>
<string name="invalid">invalid</string>
<string name="invalid">invalid</string>
<string name="none">none</string>
<!-- Not Worn Wearable Types -->
<string name="shirt_not_worn">Shirt not worn</string>

7
indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
View File

@ -1,15 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<search_combo_box
allow_text_entry="true"
list_position="BELOW"
list_position="below"
show_text_as_tentative="false"
dropdown_button_visible="false"
max_chars="256"
name="parent"
allow_new_values="true"
background_image="TextField_Search_Off"
background_image_disabled="TextField_Search_Disabled"
background_image_focused="TextField_Search_Active">
allow_new_values="true">
<combo_editor
name="child1"
select_on_focus="true"