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

merge

master
James Cook 2009-12-04 10:56:19 -08:00
parent 5b695ac56a ab6134c231
commit fa8b2135f5
57 changed files with 1098 additions and 785 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/llui/lltextbase.cpp
View File

@ -543,9 +543,17 @@ void LLTextBase::drawText()
line_end = next_start;
}
// A patch for EXT-1944 "Implement ellipses in message well"
// introduced a regression where text in SansSerif ending in the
// letter "r" is clipped. This may be due to an off-by-one in
// font width information out of FreeType with our fractional font
// sizes. For now, just make an extra pixel of space to resolve
// EXT-2971 "Letter R doesn't show when it's the last letter in a
// text block". See James/Richard for details.
const S32 FIX_CLIPPING_HACK = 1;
LLRect text_rect(line.mRect.mLeft + mTextRect.mLeft - scrolled_view_rect.mLeft,
line.mRect.mTop - scrolled_view_rect.mBottom + mTextRect.mBottom,
llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft,
llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft + FIX_CLIPPING_HACK,
line.mRect.mBottom - scrolled_view_rect.mBottom + mTextRect.mBottom);
// draw a single line of text
@ -2397,12 +2405,20 @@ void LLNormalTextSegment::setToolTip(const std::string& tooltip)
bool LLNormalTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const
{
LLWString text = mEditor.getWText();
height = mFontHeight;
width = mStyle->getFont()->getWidth(text.c_str(), mStart + first_char, num_chars);
// if last character is a newline, then return true, forcing line break
llwchar last_char = text[mStart + first_char + num_chars - 1];
bool force_newline = false;
if (num_chars > 0)
{
LLWString text = mEditor.getWText();
width = mStyle->getFont()->getWidth(text.c_str(), mStart + first_char, num_chars);
// if last character is a newline, then return true, forcing line break
llwchar last_char = text[mStart + first_char + num_chars - 1];
force_newline = (last_char == '\n');
}
else
{
width = 0;
}
LLUIImagePtr image = mStyle->getImage();
if( image.notNull())
@ -2411,7 +2427,7 @@ bool LLNormalTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& widt
height = llmax(height, image->getHeight());
}
return num_chars >= 1 && last_char == '\n';
return force_newline;
}
S32 LLNormalTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const

2
indra/llui/llview.cpp
View File

@ -2533,6 +2533,7 @@ void LLView::setupParams(LLView::Params& p, LLView* parent)
else
{
p.rect.left = p.rect.left + parent_rect.getWidth()/2 - p.rect.width/2;
p.rect.right.setProvided(false); // recalculate the right
}
}
else
@ -2553,6 +2554,7 @@ void LLView::setupParams(LLView::Params& p, LLView* parent)
else
{
p.rect.bottom = p.rect.bottom + parent_rect.getHeight()/2 - p.rect.height/2;
p.rect.top.setProvided(false); // recalculate the top
}
}
else

37
indra/newview/app_settings/settings.xml
View File

@ -3706,7 +3706,18 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.15</real>
<real>0.5</real>
</map>
<key>InspectorShowTime</key>
<map>
<key>Comment</key>
<string>Stay timing for inspectors</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>3.0</real>
</map>
<key>InstallLanguage</key>
<map>
@ -7967,7 +7978,7 @@
<key>ShowPGSearchAll</key>
<map>
<key>Comment</key>
<string>Display results of search All that are flagged as PG</string>
<string>Display results of search All that are flagged as general</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -7980,7 +7991,7 @@
<key>ShowMatureSearchAll</key>
<map>
<key>Comment</key>
<string>Display results of search All that are flagged as mature</string>
<string>Display results of search All that are flagged as moderate</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -8006,7 +8017,7 @@
<key>ShowPGGroups</key>
<map>
<key>Comment</key>
<string>Display results of find groups that are flagged as PG</string>
<string>Display results of find groups that are flagged as general</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -8019,7 +8030,7 @@
<key>ShowMatureGroups</key>
<map>
<key>Comment</key>
<string>Display results of find groups that are flagged as mature</string>
<string>Display results of find groups that are flagged as moderate</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -8045,7 +8056,7 @@
<key>ShowPGClassifieds</key>
<map>
<key>Comment</key>
<string>Display results of find classifieds that are flagged as PG</string>
<string>Display results of find classifieds that are flagged as general</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -8058,7 +8069,7 @@
<key>ShowMatureClassifieds</key>
<map>
<key>Comment</key>
<string>Display results of find classifieds that are flagged as mature</string>
<string>Display results of find classifieds that are flagged as moderate</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -8084,7 +8095,7 @@
<key>ShowPGEvents</key>
<map>
<key>Comment</key>
<string>Display results of find events that are flagged as PG</string>
<string>Display results of find events that are flagged as general</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -8097,7 +8108,7 @@
<key>ShowMatureEvents</key>
<map>
<key>Comment</key>
<string>Display results of find events that are flagged as mature</string>
<string>Display results of find events that are flagged as moderate</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -8123,7 +8134,7 @@
<key>ShowPGLand</key>
<map>
<key>Comment</key>
<string>Display results of find land sales that are flagged as PG</string>
<string>Display results of find land sales that are flagged as general</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -8136,7 +8147,7 @@
<key>ShowMatureLand</key>
<map>
<key>Comment</key>
<string>Display results of find land sales that are flagged as mature</string>
<string>Display results of find land sales that are flagged as moderate</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -8162,7 +8173,7 @@
<key>ShowPGSims</key>
<map>
<key>Comment</key>
<string>Display results of find places or find popular that are in PG sims</string>
<string>Display results of find places or find popular that are in general sims</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@ -8175,7 +8186,7 @@
<key>ShowMatureSims</key>
<map>
<key>Comment</key>
<string>Display results of find places or find popular that are in mature sims</string>
<string>Display results of find places or find popular that are in moderate sims</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>

BIN
indra/newview/installers/darwin/firstlook-dmg/_DS_Store
View File

Binary file not shown.

BIN
indra/newview/installers/darwin/publicnightly-dmg/_DS_Store
View File

Binary file not shown.

BIN
indra/newview/installers/darwin/release-dmg/_DS_Store
View File

Binary file not shown.

BIN
indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store
View File

Binary file not shown.

6
indra/newview/llfloaterbuyland.cpp
View File

@ -494,10 +494,14 @@ void LLFloaterBuyLandUI::updateCovenantInfo()
LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
if(!region) return;
U8 sim_access = region->getSimAccess();
std::string rating = LLViewerRegion::accessToString(sim_access);
LLTextBox* region_name = getChild<LLTextBox>("region_name_text");
if (region_name)
{
region_name->setText(region->getName());
std::string region_name_txt = region->getName() + " ("+rating +")";
region_name->setText(region_name_txt);
}
LLTextBox* region_type = getChild<LLTextBox>("region_type_text");

9
indra/newview/llfolderview.cpp
View File

@ -1803,15 +1803,6 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
return handled;
}
BOOL LLFolderView::handleScrollWheel(S32 x, S32 y, S32 clicks)
{
if (mScrollContainer)
{
return mScrollContainer->handleScrollWheel(x, y, clicks);
}
return FALSE;
}
void LLFolderView::deleteAllChildren()
{
if(mRenamer == gFocusMgr.getTopCtrl())

1
indra/newview/llfolderview.h
View File

@ -230,7 +230,6 @@ public:
EAcceptance* accept,
std::string& tooltip_msg);
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
virtual void draw();
virtual void deleteAllChildren();

21
indra/newview/llinspect.cpp
View File

@ -50,16 +50,16 @@ LLInspect::~LLInspect()
void LLInspect::draw()
{
static LLCachedControl<F32> FADE_TIME(*LLUI::sSettingGroups["config"], "InspectorFadeTime", 1.f);
static LLCachedControl<F32> STAY_TIME(*LLUI::sSettingGroups["config"], "InspectorShowTime", 1.f);
if (mOpenTimer.getStarted())
{
F32 alpha = clamp_rescale(mOpenTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 0.f, 1.f);
LLViewDrawContext context(alpha);
LLFloater::draw();
if (alpha == 1.f)
if (mOpenTimer.getElapsedTimeF32() > STAY_TIME)
{
mOpenTimer.stop();
mCloseTimer.start();
}
}
else if (mCloseTimer.getStarted())
{
@ -95,3 +95,16 @@ void LLInspect::onFocusLost()
mCloseTimer.start();
mOpenTimer.stop();
}
// virtual
BOOL LLInspect::handleHover(S32 x, S32 y, MASK mask)
{
mOpenTimer.pause();
return LLView::handleHover(x, y, mask);
}
// virtual
void LLInspect::onMouseLeave(S32 x, S32 y, MASK mask)
{
mOpenTimer.unpause();
}

3
indra/newview/llinspect.h
View File

@ -46,6 +46,9 @@ public:
/// Inspectors have a custom fade-in/fade-out animation
/*virtual*/ void draw();
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
/// Start open animation
/*virtual*/ void onOpen(const LLSD& avatar_id);

24
indra/newview/llinspectavatar.cpp
View File

@ -133,7 +133,6 @@ private:
LLUUID mAvatarID;
// Need avatar name information to spawn friend add request
std::string mAvatarName;
LLUUID mPartnerID;
// an in-flight request for avatar properties from LLAvatarPropertiesProcessor
// is represented by this object
LLFetchAvatarData* mPropertiesRequest;
@ -187,8 +186,7 @@ public:
LLInspectAvatar::LLInspectAvatar(const LLSD& sd)
: LLInspect( LLSD() ), // single_instance, doesn't really need key
mAvatarID(), // set in onOpen()
mPartnerID(),
mAvatarID(), // set in onOpen() *Note: we used to show partner's name but we dont anymore --angela 3rd Dec*
mAvatarName(),
mPropertiesRequest(NULL)
{
@ -257,7 +255,6 @@ void LLInspectAvatar::onOpen(const LLSD& data)
// Extract appropriate avatar id
mAvatarID = data["avatar_id"];
mPartnerID = LLUUID::null;
BOOL self = mAvatarID == gAgent.getID();
@ -307,7 +304,6 @@ void LLInspectAvatar::requestUpdate()
getChild<LLUICtrl>("user_name")->setValue("");
getChild<LLUICtrl>("user_subtitle")->setValue("");
getChild<LLUICtrl>("user_details")->setValue("");
getChild<LLUICtrl>("user_partner")->setValue("");
// Make a new request for properties
delete mPropertiesRequest;
@ -365,15 +361,6 @@ void LLInspectAvatar::processAvatarData(LLAvatarData* data)
std::string details = getString("Details", args);
getChild<LLUICtrl>("user_details")->setValue( LLSD(details) );
// Look up partner name, if there is one
mPartnerID = data->partner_id;
if (mPartnerID.notNull())
{
gCacheName->get(mPartnerID, FALSE,
boost::bind(&LLInspectAvatar::nameUpdatedCallback,
this, _1, _2, _3, _4));
}
// Delete the request object as it has been satisfied
delete mPropertiesRequest;
mPropertiesRequest = NULL;
@ -455,15 +442,6 @@ void LLInspectAvatar::nameUpdatedCallback(
mAvatarName = first + " " + last;
childSetValue("user_name", LLSD(mAvatarName) );
}
if (id == mPartnerID)
{
LLStringUtil::format_map_t args;
args["[PARTNER]"] = first + " " + last;
std::string partner = getString("Partner", args);
getChild<LLUICtrl>("user_partner")->setValue(partner);
}
// Otherwise possibly a request for an older inspector, ignore it
}
void LLInspectAvatar::onClickAddFriend()

18
indra/newview/lllocationinputctrl.cpp
View File

@ -243,38 +243,54 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
addChild(mAddLandmarkBtn);
LLButton::Params for_sale_button = p.for_sale_button;
for_sale_button.tool_tip = LLTrans::getString("LocationCtrlForSaleTooltip");
for_sale_button.click_callback.function(
boost::bind(&LLLocationInputCtrl::onForSaleButtonClicked, this));
mForSaleBtn = LLUICtrlFactory::create<LLButton>( for_sale_button );
// *TODO: Make clickable?
addChild(mForSaleBtn);
// Parcel property icons
// Must be mouse-opaque so cursor stays as an arrow when hovering to
// see tooltip.
LLIconCtrl::Params voice_icon = p.voice_icon;
voice_icon.tool_tip = LLTrans::getString("LocationCtrlVoiceTooltip");
voice_icon.mouse_opaque = true;
mParcelIcon[VOICE_ICON] = LLUICtrlFactory::create<LLIconCtrl>(voice_icon);
addChild(mParcelIcon[VOICE_ICON]);
LLIconCtrl::Params fly_icon = p.fly_icon;
fly_icon.tool_tip = LLTrans::getString("LocationCtrlFlyTooltip");
fly_icon.mouse_opaque = true;
mParcelIcon[FLY_ICON] = LLUICtrlFactory::create<LLIconCtrl>(fly_icon);
addChild(mParcelIcon[FLY_ICON]);
LLIconCtrl::Params push_icon = p.push_icon;
push_icon.tool_tip = LLTrans::getString("LocationCtrlPushTooltip");
push_icon.mouse_opaque = true;
mParcelIcon[PUSH_ICON] = LLUICtrlFactory::create<LLIconCtrl>(push_icon);
addChild(mParcelIcon[PUSH_ICON]);
LLIconCtrl::Params build_icon = p.build_icon;
build_icon.tool_tip = LLTrans::getString("LocationCtrlBuildTooltip");
build_icon.mouse_opaque = true;
mParcelIcon[BUILD_ICON] = LLUICtrlFactory::create<LLIconCtrl>(build_icon);
addChild(mParcelIcon[BUILD_ICON]);
LLIconCtrl::Params scripts_icon = p.scripts_icon;
scripts_icon.tool_tip = LLTrans::getString("LocationCtrlScriptsTooltip");
scripts_icon.mouse_opaque = true;
mParcelIcon[SCRIPTS_ICON] = LLUICtrlFactory::create<LLIconCtrl>(scripts_icon);
addChild(mParcelIcon[SCRIPTS_ICON]);
LLIconCtrl::Params damage_icon = p.damage_icon;
damage_icon.tool_tip = LLTrans::getString("LocationCtrlDamageTooltip");
damage_icon.mouse_opaque = true;
mParcelIcon[DAMAGE_ICON] = LLUICtrlFactory::create<LLIconCtrl>(damage_icon);
addChild(mParcelIcon[DAMAGE_ICON]);
LLTextBox::Params damage_text = p.damage_text;
damage_text.tool_tip = LLTrans::getString("LocationCtrlDamageTooltip");
damage_text.mouse_opaque = true;
mDamageText = LLUICtrlFactory::create<LLTextBox>(damage_text);
addChild(mDamageText);

18
indra/newview/llnearbychat.cpp
View File

@ -264,6 +264,7 @@ void LLNearbyChat::updateChatHistoryStyle()
addMessage(*it,false);
}
}
//static
void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue)
{
@ -271,3 +272,20 @@ void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue)
if(nearby_chat)
nearby_chat->updateChatHistoryStyle();
}
////////////////////////////////////////////////////////////////////////////////
//
void LLNearbyChat::onFocusReceived()
{
setBackgroundOpaque(true);
LLPanel::onFocusReceived();
}
////////////////////////////////////////////////////////////////////////////////
//
void LLNearbyChat::onFocusLost()
{
setBackgroundOpaque(false);
LLPanel::onFocusLost();
}

4
indra/newview/llnearbychat.h
View File

@ -51,6 +51,10 @@ public:
void onNearbyChatContextMenuItemClicked(const LLSD& userdata);
bool onNearbyChatCheckContextMenuItem(const LLSD& userdata);
// focus overrides
/*virtual*/ void onFocusLost();
/*virtual*/ void onFocusReceived();
/*virtual*/ void onOpen (const LLSD& key);
/*virtual*/ void setVisible(BOOL visible);

2
indra/newview/llpanellogin.cpp
View File

@ -191,7 +191,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
gViewerWindow->getRootView()->addChildInBack(this);
// Logo
mLogoImage = LLUI::getUIImage("startup_logo.j2c");
mLogoImage = LLUI::getUIImage("startup_logo");
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_login.xml");

20
indra/newview/llpanelobjectinventory.cpp
View File

@ -1696,6 +1696,7 @@ void LLPanelObjectInventory::updateInventory()
mFolders->requestArrange();
mInventoryNeedsUpdate = FALSE;
LLEditMenuHandler::gEditMenuHandler = mFolders;
}
// *FIX: This is currently a very expensive operation, because we have
@ -1940,3 +1941,22 @@ void LLPanelObjectInventory::idle(void* user_data)
self->updateInventory();
}
}
void LLPanelObjectInventory::onFocusLost()
{
// inventory no longer handles cut/copy/paste/delete
if (LLEditMenuHandler::gEditMenuHandler == mFolders)
{
LLEditMenuHandler::gEditMenuHandler = NULL;
}
LLPanel::onFocusLost();
}
void LLPanelObjectInventory::onFocusReceived()
{
// inventory now handles cut/copy/paste/delete
LLEditMenuHandler::gEditMenuHandler = mFolders;
LLPanel::onFocusReceived();
}

3
indra/newview/llpanelobjectinventory.h
View File

@ -74,6 +74,9 @@ public:
virtual void deleteAllChildren();
virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
/*virtual*/ void onFocusLost();
/*virtual*/ void onFocusReceived();
static void idle(void* user_data);
protected:

7
indra/newview/llviewerfloaterreg.cpp
View File

@ -226,7 +226,12 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("test_inspectors", "floater_test_inspectors.xml",
&LLFloaterReg::build<LLFloaterTestInspectors>);
//LLFloaterReg::add("test_list_view", "floater_test_list_view.xml",&LLFloaterReg::build<LLFloaterTestListView>);
LLFloaterReg::add("test_widgets", "floater_test_widgets.xml", &LLFloaterReg::build<LLFloater>);
LLFloaterReg::add("test_textbox", "floater_test_textbox.xml",
&LLFloaterReg::build<LLFloater>);
LLFloaterReg::add("test_text_editor", "floater_test_text_editor.xml",
&LLFloaterReg::build<LLFloater>);
LLFloaterReg::add("test_widgets", "floater_test_widgets.xml",
&LLFloaterReg::build<LLFloater>);
LLFloaterReg::add("top_objects", "floater_top_objects.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTopObjects>);
LLFloaterReg::add("reporter", "floater_report_abuse.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterReporter>);

2
indra/newview/skins/default/colors.xml
View File

@ -686,6 +686,6 @@
value="0.3 0.3 0.3 1.0" />
<color
name="ChatToastAgentNameColor"
value="1.0 0.3 1.0 1.0" />
reference="EmphasisColor" />
</colors>

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

@ -343,8 +343,8 @@ with the same filename but different name
<texture name="parcel_drk_BuildNo" file_name="icons/parcel_drk_BuildNo.png" preload="false" />
<texture name="parcel_drk_Damage" file_name="icons/parcel_drk_Damage.png" preload="false" />
<texture name="parcel_drk_DamageNo" file_name="icons/parcel_drk_DamageNo.png" preload="false" />
<texture name="parcel_drk_EVRY" file_name="icons/parcel_drk_EVRY.png" preload="false" />
<texture name="parcel_drk_EXP" file_name="icons/parcel_drk_EXP.png" preload="false" />
<texture name="parcel_drk_EVRY" file_name="icons/parcel_drk_EVRY.png" preload="false" />
<texture name="parcel_drk_EXP" file_name="icons/parcel_drk_EXP.png" preload="false" />
<texture name="parcel_drk_Fly" file_name="icons/parcel_drk_Fly.png" preload="false" />
<texture name="parcel_drk_FlyNo" file_name="icons/parcel_drk_FlyNo.png" preload="false" />
<texture name="parcel_drk_ForSale" file_name="icons/parcel_drk_ForSale.png" preload="false" />
@ -363,8 +363,8 @@ with the same filename but different name
<texture name="parcel_lght_BuildNo" file_name="icons/parcel_lght_BuildNo.png" preload="false" />
<texture name="parcel_lght_Damage" file_name="icons/parcel_lght_Damage.png" preload="false" />
<texture name="parcel_lght_DamageNo" file_name="icons/parcel_lght_DamageNo.png" preload="false" />
<texture name="parcel_lght_EVRY" file_name="icons/parcel_lght_EVRY.png" preload="false" />
<texture name="parcel_lght_EXP" file_name="icons/parcel_lght_EXP.png" preload="false" />
<texture name="parcel_lght_EVRY" file_name="icons/parcel_lght_EVRY.png" preload="false" />
<texture name="parcel_lght_EXP" file_name="icons/parcel_lght_EXP.png" preload="false" />
<texture name="parcel_lght_Fly" file_name="icons/parcel_lght_Fly.png" preload="false" />
<texture name="parcel_lght_FlyNo" file_name="icons/parcel_lght_FlyNo.png" preload="false" />
<texture name="parcel_lght_ForSale" file_name="icons/parcel_lght_ForSale.png" preload="false" />
@ -488,6 +488,8 @@ with the same filename but different name
<texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" />
<texture name="Snapshot_Press" file_name="bottomtray/Snapshot_Press.png" preload="false" />
<texture name="startup_logo" file_name="windows/startup_logo.png" preload="true" />
<texture name="Stepper_Down_Disabled" file_name="widgets/Stepper_Down_Disabled.png" preload="true" />
<texture name="Stepper_Down_Off" file_name="widgets/Stepper_Down_Off.png" preload="true" />
<texture name="Stepper_Down_Press" file_name="widgets/Stepper_Down_Press.png" preload="true" />
@ -706,7 +708,6 @@ with the same filename but different name
<texture name="tab_top_blue.tga" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
<texture name="tab_top_selected_blue.tga" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
<texture name="startup_logo.j2c" preload="true" />
<texture name="color_swatch_alpha.tga" preload="true" />
<texture name="button_anim_pause.tga" />

BIN
indra/newview/skins/default/textures/windows/startup_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

885
indra/newview/skins/default/xui/en/floater_about_land.xml
View File

File diff suppressed because it is too large Load Diff

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

@ -1,5 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
border_visible = "false"
border_drop_shadow_visible = "false"
drop_shadow_visible = "false"
border = "false"
bg_opaque_image="Inspector_Background"
bg_alpha_image="Toast_Background"
bg_alpha_color="0 0 0 0"
legacy_header_height="18"
can_minimize="false"
can_tear_off="false"

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

@ -309,7 +309,7 @@
name="Indecency__Mature_content_in_PG_region"
value="60" />
<combo_box.item
label="Indecency &gt; Inappropriate content or conduct in a Mature region"
label="Indecency &gt; Inappropriate content or conduct in a Moderate region"
name="Indecency__Inappropriate_content_in_Mature_region"
value="69" />
<combo_box.item

20
indra/newview/skins/default/xui/en/floater_test_text_editor.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
can_resize="true"
height="600"
layout="topleft"
name="floater_test_text_editor"
width="800">
<text_editor
height="50"
follows="top|left|bottom"
layout="topleft"
left="10"
name="test_text_editor"
tool_tip="text editor"
top="25"
width="200">
Text Editor
</text_editor>
</floater>

17
indra/newview/skins/default/xui/en/floater_test_textbox.xml
View File

@ -21,6 +21,21 @@ Third line of multiple lines
Fourth line of multiple lines
Fifth line of multiple lines
</text>
<text
clip_partial="true"
top_pad="10"
left="10"
width="267"
height="28"
layout="topleft"
follows="right|left"
text_color="white"
use_ellipses="true"
word_wrap="true"
mouse_opaque="false"
name="title" >
This text has word_wrap set true, use_ellipses set true, and clip_partial set true, so it should wrap around, spilling over to the last line, then clip the last partial line and show ellipses to indicate there is more text
</text>
<text
font="SansSerif"
@ -28,7 +43,7 @@ Fifth line of multiple lines
height="10"
layout="topleft"
left_delta="0"
top_pad="40"
top_pad="10"
width="300">
SansSerif BOLD
</text>

30
indra/newview/skins/default/xui/en/floater_world_map.xml
View File

@ -393,21 +393,21 @@
</panel>
<panel
follows="right|top|bottom"
height="270"
top_pad="0"
width="238">
<icon
color="0.5 0 0 1"
follows="top|right"
height="16"
image_name="map_track_16.tga"
layout="topleft"
left="5"
top="11"
mouse_opaque="true"
name="friends_icon"
width="16" />
follows="right|top|bottom"
height="270"
top_pad="0"
width="238">
<icon
color="0.5 0 0 1"
follows="top|right"
height="16"
image_name="map_track_16.tga"
layout="topleft"
left="5"
top="11"
mouse_opaque="true"
name="friends_icon"
width="16" />
<combo_box
allow_text_entry="true"
follows="top|right"

37
indra/newview/skins/default/xui/en/inspect_avatar.xml
View File

@ -19,7 +19,7 @@
<!-- Allowed fields include:
[BORN_ON] ("12/3/2008")
[SL_PROFILE] (Second Life profile),
[RW_PROFILE] (real world profile),
[RW_PROFILE] (real world profile),
[ACCTTYPE] ("Resident"),
[PAYMENTINFO] ("Payment Info on File"),
[AGE] ("1 year 2 months")
@ -32,10 +32,6 @@
name="Details">
[SL_PROFILE]
</string>
<string
name="Partner">
Partner: [PARTNER]
</string>
<text
follows="all"
font="SansSerifLarge"
@ -52,31 +48,20 @@
height="16"
left="8"
name="user_subtitle"
font="SansSerifSmall"
text_color="White"
font="SansSerifSmall"
text_color="White"
value="11 Months, 3 days old"
width="175"
use_ellipses="true" />
<text
follows="all"
height="25"
left="8"
height="35"
left="8"
name="user_details"
word_wrap="true"
top_pad="6"
width="220">This is my second life description and I really think it is great.
</text>
<text
follows="all"
height="13"
left="8"
name="user_partner"
top_pad="3"
width="220"
use_ellipses="true"
word_wrap="false">
Erica Linden
</text>
<slider
follows="top|left"
height="23"
@ -113,8 +98,9 @@
name="avatar_icon"
top="10"
width="38" />
<!-- Overlapping buttons for default actions
llinspectavatar.cpp makes visible the most likely default action -->
<!-- Overlapping buttons for default actions
llinspectavatar.cpp makes visible the most likely default action
-->
<button
follows="bottom|left"
height="20"
@ -131,9 +117,8 @@
top_delta="0"
name="im_btn"
width="80"
commit_callback.function="InspectAvatar.IM"
/>
<button
commit_callback.function="InspectAvatar.IM"/>
<button
follows="top|left"
height="20"
label="More"
@ -153,7 +138,7 @@
right="-5"
top_delta="0"
width="35" />
<menu_button
<menu_button
follows="top|left"
height="20"
image_overlay="OptionsMenu_Off"

11
indra/newview/skins/default/xui/en/inspect_group.xml
View File

@ -9,7 +9,7 @@
bg_opaque_image="Inspector_Background"
can_close="false"
can_minimize="false"
height="148"
height="158"
layout="topleft"
name="inspect_group"
single_instance="true"
@ -49,6 +49,7 @@
height="45"
left="8"
name="group_details"
use_ellipses="true"
top_pad="6"
width="220"
word_wrap="true">
@ -60,7 +61,7 @@ Fear the moose! Fear it! And the mongoose too!
height="13"
left="8"
name="group_cost"
top_pad="3"
top_pad="13"
width="220">
L$123 to join
</text>
@ -78,7 +79,7 @@ L$123 to join
height="23"
label="Join"
left="8"
top="266"
top="286"
name="join_btn"
width="103"
commit_callback.function="InspectGroup.Join"/>
@ -87,7 +88,7 @@ L$123 to join
height="23"
label="Leave"
left="8"
top="266"
top="286"
name="leave_btn"
width="103"
commit_callback.function="InspectGroup.Leave"/>
@ -96,7 +97,7 @@ L$123 to join
height="23"
label="View Profile"
name="view_profile_btn"
top="266"
top="286"
left="117"
width="103"
commit_callback.function="InspectGroup.ViewProfile" />

14
indra/newview/skins/default/xui/en/main_view.xml
View File

@ -10,22 +10,16 @@
<layout_stack border_size="0"
follows="all"
mouse_opaque="false"
height="768"
height="749"
name="menu_stack"
orientation="vertical"
top="0">
top="19">
<layout_panel auto_resize="false"
height="84"
height="65"
mouse_opaque="false"
name="nav_and_status_bar_region"
name="nav_bar_container"
width="1024"
visible="false">
<panel follows="left|right|bottom"
left="0"
name="nav_bar_container"
right="1024"
top="19"
height="65"/>
</layout_panel>
<layout_panel auto_resize="true"
follows="all"

41
indra/newview/skins/default/xui/en/menu_login.xml
View File

@ -185,21 +185,42 @@
<menu_item_call.on_click
function="Advanced.ShowSideTray" />
</menu_item_call>
<menu
label="UI Tests"
name="UI Tests"
tear_off="true">
<menu_item_call
label="Widget Test"
name="Widget Test"
label="Textbox"
name="Textbox"
shortcut="control|1">
<menu_item_call.on_click
function="ShowFloater"
parameter="test_textbox" />
</menu_item_call>
<menu_item_call
label="Text Editor"
name="Text Editor"
shortcut="control|2">
<menu_item_call.on_click
function="ShowFloater"
parameter="test_text_editor" />
</menu_item_call>
<menu_item_call
label="Widgets"
name="Widgets"
shortcut="control|shift|T">
<menu_item_call.on_click
function="ShowFloater"
parameter="test_widgets" />
<menu_item_call.on_click
function="ShowFloater"
parameter="test_widgets" />
</menu_item_call>
<menu_item_call
label="Inspectors Test"
name="Inspectors Test">
<menu_item_call.on_click
function="ShowFloater"
parameter="test_inspectors" />
label="Inspectors"
name="Inspectors">
<menu_item_call.on_click
function="ShowFloater"
parameter="test_inspectors" />
</menu_item_call>
</menu>
<menu_item_check
label="Reg In Client Test (restart)"
name="Reg In Client Test (restart)">

8
indra/newview/skins/default/xui/en/menu_text_editor.xml
View File

@ -32,10 +32,10 @@
function="Edit.EnablePaste" />
</menu_item_call>
<menu_item_call
label="Delete"
layout="topleft"
name="Delete"
shortcut="Del">
label="Delete"
layout="topleft"
name="Delete"
shortcut="Del">
<menu_item_call.on_click
function="Edit.Delete" />
<menu_item_call.on_enable

6
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -3480,7 +3480,7 @@ Publish this classified now for L$[AMOUNT]?
icon="alertmodal.tga"
name="SetClassifiedMature"
type="alertmodal">
Does this classified contain Mature content?
Does this classified contain Moderate content?
<usetemplate
canceltext="Cancel"
name="yesnocancelbuttons"
@ -3492,7 +3492,7 @@ Does this classified contain Mature content?
icon="alertmodal.tga"
name="SetGroupMature"
type="alertmodal">
Does this group contain Mature content?
Does this group contain Moderate content?
<usetemplate
canceltext="Cancel"
name="yesnocancelbuttons"
@ -4568,7 +4568,7 @@ Some terms in your search query were excluded due to content restrictions as cla
icon="notifytip.tga"
name="NoContentToSearch"
type="notifytip">
Please select at least one type of content to search (PG, Mature, or Adult).
Please select at least one type of content to search (General, Moderate, or Adult).
</notification>
<notification

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

@ -111,11 +111,11 @@
name="select_mature"
value="Select" />
<combo_box.item
label="Mature Content"
label="Moderate Content"
name="mature"
value="Mature" />
<combo_box.item
label="PG Content"
label="General Content"
name="pg"
value="PG" />
</combo_box>

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

@ -11,11 +11,11 @@
width="333">
<panel.string
name="type_mature">
Mature
Moderate
</panel.string>
<panel.string
name="type_pg">
PG Content
General Content
</panel.string>
<button
follows="top|right"

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

@ -189,12 +189,12 @@
<combo_item
name="mature_ci"
value="Mature">
Mature Content
Moderate Content
</combo_item>
<combo_item
name="pg_ci"
value="PG">
PG Content
General Content
</combo_item>
</combo_box>
<spinner

70
indra/newview/skins/default/xui/en/panel_group_general.xml
View File

@ -1,14 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
height="378"
height="395"
label="General"
class="panel_group_general"
layout="topleft"
left="0"
top="0"
name="general_tab"
width="310">
width="323">
<panel.string
name="help_text">
The General tab contains general information about this group, a list of members, general Group Preferences and member options.
@ -32,7 +30,7 @@ Hover your mouse over the options for more help.
max_length="511"
name="charter"
top="5"
width="305"
right="-1"
word_wrap="true">
Group Charter
</text_editor>
@ -41,12 +39,12 @@ Hover your mouse over the options for more help.
draw_heading="true"
follows="left|top"
heading_height="20"
height="130"
height="156"
layout="topleft"
left="0"
right="-1"
name="visible_members"
top_pad="2"
width="310">
top_pad="2">
<name_list.columns
label="Member"
name="name"
@ -71,15 +69,15 @@ Hover your mouse over the options for more help.
follows="left|top"
height="20"
layout="topleft"
left_delta="0"
left="5"
right="-5"
name="active_title"
tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."
top_pad="2"
width="300" />
top_pad="2" />
<check_box
height="16"
font="SansSerifSmall"
label="Receive notices"
label="Receive group notices"
layout="topleft"
left="5"
name="receive_notices"
@ -101,12 +99,12 @@ Hover your mouse over the options for more help.
border="true"
bg_alpha_color="FloaterUnfocusBorderColor"
follows="left|top"
height="90"
height="88"
layout="topleft"
left="5"
left="2"
right="-1"
name="preferences_container"
top_pad="5"
width="300">
top_pad="2">
<check_box
follows="right|top"
height="16"
@ -132,16 +130,35 @@ Hover your mouse over the options for more help.
halign="left"
height="16"
increment="1"
label_width="20"
label_width="15"
label="L$"
layout="topleft"
right="-10"
max_val="99999"
left_pad="2"
left_pad="0"
name="spin_enrollment_fee"
tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
width="100" />
<combo_box
follows="left|top"
height="20"
layout="topleft"
left="10"
name="group_mature_check"
tool_tip="Sets whether your group information is considered moderate"
top_pad="0"
width="190">
<combo_box.item
label="General Content"
name="pg"
value="Not Mature" />
<combo_box.item
label="Moderate Content"
name="mature"
value="Mature" />
</combo_box>
<check_box
follows="left|top"
height="16"
initial_value="true"
label="Show in search"
@ -151,22 +168,5 @@ Hover your mouse over the options for more help.
tool_tip="Let people see this group in search results"
top_pad="4"
width="300" />
<combo_box
height="20"
layout="topleft"
left_delta="0"
name="group_mature_check"
tool_tip="Sets whether your group information is considered mature"
top_pad="2"
width="190">
<combo_box.item
label="PG Content"
name="pg"
value="Not Mature" />
<combo_box.item
label="Mature Content"
name="mature"
value="Mature" />
</combo_box>
</panel>
</panel>

118
indra/newview/skins/default/xui/en/panel_login.xml
View File

@ -48,13 +48,13 @@
left="20"
name="first_name_text"
top="20"
width="135">
width="150">
Name:
</text>
<line_editor
follows="left|bottom"
handle_edit_keys_directly="true"
height="23"
height="22"
label="First"
left_delta="0"
max_length="31"
@ -66,7 +66,7 @@
<line_editor
follows="left|bottom"
handle_edit_keys_directly="true"
height="23"
height="22"
label="Last"
left_pad="8"
max_length="31"
@ -75,20 +75,74 @@
tool_tip="[SECOND_LIFE] Last Name"
top_delta="0"
width="135" />
<text
<combo_box
allow_text_entry="true"
font="SansSerifSmall"
follows="left|bottom"
height="23"
layout="topleft"
top="60"
name="server_combo"
width="135"
visible="false" />
<text
follows="left|bottom"
font="SansSerifSmall"
height="15"
left_pad="8"
name="password_text"
top="20"
width="150">
Password:
</text>
<line_editor
follows="left|bottom"
handle_edit_keys_directly="true"
height="22"
left="304"
max_length="16"
name="password_edit"
select_on_focus="true"
top_pad="1"
width="135" />
<check_box
control_name="RememberPassword"
follows="left|bottom"
font="SansSerifSmall"
height="16"
label="Remember"
left_pad="20"
top="20"
name="remember_check"
width="150" />
<button
follows="left|bottom"
height="23"
image_unselected="PushButton_On"
image_selected="PushButton_On_Selected"
label="Log In"
label_color="White"
layout="topleft"
left="462"
name="connect_btn"
top="35"
width="90" />
<text
follows="right|bottom"
font="SansSerifSmall"
height="15"
halign="right"
left_pad="10"
right="-240"
name="start_location_text"
top="20"
width="135">
width="130">
Starting location:
</text>
<combo_box
allow_text_entry="true"
control_name="LoginLocation"
follows="left|bottom"
follows="right|bottom"
height="23"
max_chars="128"
top_pad="0"
@ -107,58 +161,6 @@
name="Typeregionname"
value="" />
</combo_box>
<combo_box
allow_text_entry="true"
font="SansSerifSmall"
follows="left|bottom"
height="23"
layout="topleft"
top="60"
name="server_combo"
width="135"
visible="false" />
<text
follows="left|bottom"
font="SansSerifSmall"
height="15"
left_pad="3"
name="password_text"
top="20"
width="135">
Password:
</text>
<line_editor
follows="left|bottom"
handle_edit_keys_directly="true"
height="23"
left_delta="0"
max_length="16"
name="password_edit"
select_on_focus="true"
top_pad="0"
width="135" />
<check_box
control_name="RememberPassword"
follows="left|bottom"
font="SansSerifSmall"
height="16"
label="Remember"
left_pad="5"
name="remember_check"
top_delta="5"
width="90" />
<button
follows="left|bottom"
height="23"
image_unselected="PushButton_On"
image_selected="PushButton_On_Selected"
label="Log In"
label_color="White"
layout="topleft"
left_pad="20"
name="connect_btn"
top="35"
width="90" />
<text
follows="right|bottom"
font="SansSerifSmall"

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

@ -602,7 +602,7 @@
layout="topleft"
left_pad="10"
name="region_rating"
value="Explicit"
value="Adult"
width="159" />
<text
follows="left|top"

6
indra/newview/skins/default/xui/en/panel_preferences_general.xml
View File

@ -143,15 +143,15 @@
top_pad="-10"
width="170">
<combo_box.item
label="PG, Mature and Adult"
label="General, Moderate, Adult"
name="Desired_Adult"
value="42" />
<combo_box.item
label="PG and Mature"
label="General and Moderate"
name="Desired_Mature"
value="21" />
<combo_box.item
label="PG"
label="General"
name="Desired_PG"
value="13" />
</combo_box>

6
indra/newview/skins/default/xui/en/panel_region_general.xml
View File

@ -171,7 +171,7 @@
</text>
<combo_box
height="20"
label="Mature"
label="Moderate"
layout="topleft"
left_delta="100"
name="access_combo"
@ -182,11 +182,11 @@
name="Adult"
value="42" />
<combo_box.item
label="Mature"
label="Moderate"
name="Mature"
value="21" />
<combo_box.item
label="PG"
label="General"
name="PG"
value="13" />
</combo_box>

242
indra/newview/skins/default/xui/en/panel_region_general_layout.xml Normal file
View File

@ -0,0 +1,242 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
follows="top|left"
height="360"
label="Region"
layout="topleft"
left="0"
name="General"
top="360"
width="280">
<text
follows="left|top"
font="SansSerif"
height="20"
layout="topleft"
left="10"
name="region_text_lbl"
top="10"
width="100">
Region:
</text>
<text
follows="left|top"
font="SansSerif"
height="20"
layout="topleft"
left_delta="50"
name="region_text"
top_delta="0"
width="200">
unknown
</text>
<text
follows="left|top"
font="SansSerif"
height="20"
layout="topleft"
left="10"
name="version_channel_text_lbl"
top="30"
width="100">
Version:
</text>
<text
follows="left|top"
font="SansSerif"
height="20"
layout="topleft"
left_delta="50"
name="version_channel_text"
top_delta="0"
width="200">
unknown
</text>
<text
follows="left|top"
font="SansSerif"
height="20"
layout="topleft"
left="10"
name="region_type_lbl"
top="50"
width="100">
Type:
</text>
<text
follows="left|top"
font="SansSerif"
height="20"
layout="topleft"
left_delta="50"
name="region_type"
top_delta="0"
width="200">
unknown
</text>
<check_box
height="20"
label="Block Terraform"
layout="topleft"
left="10"
name="block_terraform_check"
top="70"
width="80" />
<check_box
height="20"
label="Block Fly"
layout="topleft"
left="10"
name="block_fly_check"
top="90"
width="80" />
<check_box
height="20"
label="Allow Damage"
layout="topleft"
left="10"
name="allow_damage_check"
top="110"
width="80" />
<check_box
height="20"
label="Restrict Pushing"
layout="topleft"
left="10"
name="restrict_pushobject"
top="130"
width="80" />
<check_box
height="20"
label="Allow Land Resell"
layout="topleft"
left="10"
name="allow_land_resell_check"
top="160"
width="80" />
<check_box
height="20"
label="Allow Land Join/Divide"
layout="topleft"
left="10"
name="allow_parcel_changes_check"
top="180"
width="80" />
<check_box
height="20"
label="Block Land Show in Search"
layout="topleft"
left="10"
name="block_parcel_search_check"
tool_tip="Let people see this region and its parcels in search results"
top="200"
width="80" />
<spinner
follows="left|top"
height="20"
increment="1"
label="Agent Limit"
label_width="97"
layout="topleft"
left="10"
max_val="100"
min_val="1"
name="agent_limit_spin"
top="240"
width="170" />
<spinner
follows="left|top"
height="20"
increment="0.5"
label="Object Bonus"
label_width="97"
layout="topleft"
left="10"
max_val="10"
min_val="1"
name="object_bonus_spin"
top="260"
width="170" />
<text
follows="left|top"
height="20"
label="Maturity"
layout="topleft"
left="10"
name="access_text"
top="290"
width="100">
Rating:
</text>
<combo_box
height="20"
label="Moderate"
layout="topleft"
left_delta="100"
name="access_combo"
top_delta="0"
width="85">
<combo_box.item
label="Adult"
name="Adult"
value="42" />
<combo_box.item
label="Moderate"
name="Mature"
value="21" />
<combo_box.item
label="General"
name="PG"
value="13" />
</combo_box>
<button
enabled="false"
follows="left|top"
height="20"
label="Apply"
layout="topleft"
left="108"
name="apply_btn"
top="320"
width="100"/>
<button
follows="left|top"
height="20"
label="Teleport Home One User..."
layout="topleft"
left="10"
name="kick_btn"
top_pad="10"
width="250" />
<button
follows="left|top"
height="20"
label="Teleport Home All Users..."
layout="topleft"
left_delta="0"
name="kick_all_btn"
top_pad="3"
width="250" />
<button
follows="left|top"
height="20"
label="Send Message To Region..."
layout="topleft"
left_delta="0"
name="im_btn"
top_pad="20"
width="200" />
<button
follows="left|top"
height="20"
label="Manage Telehub..."
layout="topleft"
left_delta="0"
name="manage_telehub_btn"
top_pad="20"
width="150" >
<button.commit_callback
function="RegionInfo.ManageTelehub" />
</button>
</panel>

44
indra/newview/skins/default/xui/en/panel_toast.xml
View File

@ -5,28 +5,28 @@
<floater
legacy_header_height="18"
name="toast"
title=""
visible="false"
layout="topleft"
height="40"
width="305"
left="0"
top="0"
follows="right|bottom"
bg_opaque_image="Toast_Background"
bg_alpha_image="Toast_Background"
can_minimize="false"
can_tear_off="false"
can_resize="false"
can_drag_on_left="false"
can_close="false"
can_dock="false"
border_visible = "false"
border_drop_shadow_visible = "false"
drop_shadow_visible = "false"
border = "false"
>
name="toast"
title=""
visible="false"
layout="topleft"
height="40"
width="305"
left="0"
top="0"
follows="right|bottom"
bg_opaque_image="Toast_Background"
bg_alpha_image="Toast_Background"
can_minimize="false"
can_tear_off="false"
can_resize="false"
can_drag_on_left="false"
can_close="false"
can_dock="false"
border_visible = "false"
border_drop_shadow_visible = "false"
drop_shadow_visible = "false"
border = "false"
>
<!-- Don't remove this wiget! It is needed for Overflow and Start-Up toasts!-->
<text
clip_partial="true"

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

@ -270,8 +270,8 @@
<string name="NotConnected">Not Connected</string>
<!-- Sim Access labels -->
<string name="SIM_ACCESS_PG">PG</string>
<string name="SIM_ACCESS_MATURE">Mature</string>
<string name="SIM_ACCESS_PG">General</string>
<string name="SIM_ACCESS_MATURE">Moderate</string>
<string name="SIM_ACCESS_ADULT">Adult</string>
<string name="SIM_ACCESS_DOWN">Offline</string>
<string name="SIM_ACCESS_MIN">Unknown</string>
@ -2777,11 +2777,19 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Wild">Wild</string>
<string name="Wrinkles">Wrinkles</string>
<!-- Favorites Bar -->
<!-- Navigation bar location input control.
Strings are here because widget xml is not localizable -->
<string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string>
<string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string>
<string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string>
<string name="LocationCtrlComboBtnTooltip">My location history</string>
<string name="LocationCtrlForSaleTooltip">Buy this land</string>
<string name="LocationCtrlVoiceTooltip">Voice not available here</string>
<string name="LocationCtrlFlyTooltip">Flying not allowed</string>
<string name="LocationCtrlPushTooltip">No pushing</string>
<string name="LocationCtrlBuildTooltip">Building/dropping objects not allowed</string>
<string name="LocationCtrlScriptsTooltip">Scripts not allowed</string>
<string name="LocationCtrlDamageTooltip">Health</string>
<!-- Strings used by the (currently Linux) auto-updater app -->
<string name="UpdaterWindowTitle">

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

@ -9,5 +9,6 @@
header_image_over="Accordion_Over"
header_image_pressed="Accordion_Press"
header_image_expanded="Accordion_Selected"
header_text_color="LtGray"
header_text_color="LtGray"
font="SansSerif"
/>

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

@ -15,4 +15,5 @@
track_bottom="true"
name="chat_history"
type="string"
word_wrap="true" />
word_wrap="true"
font="SansSerif"/>

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

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<chiclet_script
name="script_chiclet">
name="script_chiclet"
font="SansSerif">
<icon
name="chiclet_icon"
follows="all"

47
indra/newview/skins/default/xui/en/widgets/floater.xml
View File

@ -1,25 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- See also settings.xml UIFloater* settings for configuration -->
<floater name="floater"
bg_opaque_color="FloaterFocusBackgroundColor"
bg_alpha_color="FloaterDefaultBackgroundColor"
bg_opaque_image="Window_Foreground"
bg_alpha_image="Window_Background"
background_visible="true"
background_opaque="false"
header_height="25"
close_image="Icon_Close_Foreground"
restore_image="Icon_Restore_Foreground"
minimize_image="Icon_Minimize_Foreground"
tear_off_image="tearoffbox.tga"
dock_image="Icon_Dock_Foreground"
undock_image="Icon_Undock_Foreground"
help_image="Icon_Help_Foreground"
close_pressed_image="Icon_Close_Press"
restore_pressed_image="Icon_Restore_Press"
minimize_pressed_image="Icon_Minimize_Press"
tear_off_pressed_image="tearoff_pressed.tga"
dock_pressed_image="Icon_Dock_Press"
undock_pressed_image="Icon_Undock_Press"
help_pressed_image="Icon_Help_Press"
<floater
name="floater"
bg_opaque_color="FloaterFocusBackgroundColor"
bg_alpha_color="FloaterDefaultBackgroundColor"
bg_opaque_image="Window_Foreground"
bg_alpha_image="Window_Background"
background_visible="true"
background_opaque="false"
header_height="25"
top="0"
left="0"
close_image="Icon_Close_Foreground"
restore_image="Icon_Restore_Foreground"
minimize_image="Icon_Minimize_Foreground"
tear_off_image="tearoffbox.tga"
dock_image="Icon_Dock_Foreground"
undock_image="Icon_Undock_Foreground"
help_image="Icon_Help_Foreground"
close_pressed_image="Icon_Close_Press"
restore_pressed_image="Icon_Restore_Press"
minimize_pressed_image="Icon_Minimize_Press"
tear_off_pressed_image="tearoff_pressed.tga"
dock_pressed_image="Icon_Dock_Press"
undock_pressed_image="Icon_Undock_Press"
help_pressed_image="Icon_Help_Press"
/>

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

@ -20,6 +20,8 @@
follows="left|top"
allow_new_values="true"
>
<!-- *NOTE: Tooltips are in strings.xml so they can be localized.
See LocationCtrlAddLandmarkTooltip etc. -->
<info_button name="Place Information"
width="16"
height="16"
@ -50,6 +52,7 @@
top="21"
/>
<voice_icon
enabled="true"
name="voice_icon"
width="22"
height="18"

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

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- Use this for the top-level menu styling -->
<menu_item>
</menu_item>
<menu_item font="SansSerif" />

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<radio_item follows="left|top">
<radio_item follows="left|top" font="SansSerif">
<radio_item.label_text name="Radio Item label"/>
<radio_item.check_button name="Radio control button"
image_unselected="RadioButton_Off"

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

@ -8,4 +8,5 @@
track_image_horizontal="SliderTrack_Horiz"
track_image_vertical="SliderTrack_Vert"
track_highlight_horizontal_image="SliderTrack_Horiz"
track_highlight_vertical_image="SliderTrack_Vert" />
track_highlight_vertical_image="SliderTrack_Vert"
font="SansSerif" />

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

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<spinner text_enabled_color="LabelTextColor"
text_disabled_color="LabelDisabledColor"
font="SansSerif"
decimal_digits="3"
label_width="40" >
<spinner.up_button name="SpinCtrl Up"

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

@ -1,2 +1,3 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<textbase clip_partial="false"/>
<textbase clip_partial="false"
font="SansSerif"/>

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- Global settings for all widgets ("UI Controls") -->
<!-- The params in this file aren't currently getting loaded in OSX -->
<ui_ctrl
font="SansSerif"
/>