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

Automated merge from viewer-development

meow-7.2.2
Loren Shih 2011-01-05 16:35:09 -05:00
parent 3b1a06b024 e2f197b6f7
commit c3501a4f23
12 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/contributions.txt
View File

@ -364,12 +364,13 @@ JB Kraft
Joghert LeSabre
VWR-64
Jonathan Yap
VWR-17801
STORM-596
STORM-523
STORM-616
STORM-679
STORM-596
STORM-737
STORM-726
VWR-17801
STORM-785
Kage Pixel
VWR-11
@ -748,6 +749,8 @@ Tue Torok
CT-74
Twisted Laws
SNOW-352
STORM-466
STORM-467
Vadim Bigbear
VWR-2681
Vector Hastings

4
indra/llui/llfloater.cpp
View File

@ -2910,7 +2910,9 @@ bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::str
params.from_xui = true;
applyXUILayout(params, parent);
initFromParams(params);
// chrome floaters don't take focus at all
setFocusRoot(!getIsChrome());
initFloater(params);
LLMultiFloater* last_host = LLFloater::getFloaterHost();

13
indra/newview/llfloatermap.cpp
View File

@ -83,7 +83,6 @@ LLFloaterMap::~LLFloaterMap()
BOOL LLFloaterMap::postBuild()
{
mMap = getChild<LLNetMap>("Net Map");
mMap->setScale(gSavedSettings.getF32("MiniMapScale"));
mMap->setToolTipMsg(getString("ToolTipMsg"));
sendChildToBack(mMap);
@ -288,7 +287,16 @@ void LLFloaterMap::handleZoom(const LLSD& userdata)
std::string level = userdata.asString();
F32 scale = 0.0f;
if (level == std::string("close"))
if (level == std::string("default"))
{
LLControlVariable *pvar = gSavedSettings.getControl("MiniMapScale");
if(pvar)
{
pvar->resetToDefault();
scale = gSavedSettings.getF32("MiniMapScale");
}
}
else if (level == std::string("close"))
scale = LLNetMap::MAP_SCALE_MAX;
else if (level == std::string("medium"))
scale = LLNetMap::MAP_SCALE_MID;
@ -296,7 +304,6 @@ void LLFloaterMap::handleZoom(const LLSD& userdata)
scale = LLNetMap::MAP_SCALE_MIN;
if (scale != 0.0f)
{
gSavedSettings.setF32("MiniMapScale", scale );
mMap->setScale(scale);
}
}

5
indra/newview/llinventorybridge.cpp
View File

@ -5344,11 +5344,6 @@ void LLRecentItemsFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
menuentry_vec_t disabled_items, items = getMenuItems();
items.erase(std::remove(items.begin(), items.end(), std::string("New Body Parts")), items.end());
items.erase(std::remove(items.begin(), items.end(), std::string("New Clothes")), items.end());
items.erase(std::remove(items.begin(), items.end(), std::string("New Note")), items.end());
items.erase(std::remove(items.begin(), items.end(), std::string("New Gesture")), items.end());
items.erase(std::remove(items.begin(), items.end(), std::string("New Script")), items.end());
items.erase(std::remove(items.begin(), items.end(), std::string("New Folder")), items.end());
hide_context_entries(menu, items, disabled_items);

3
indra/newview/llnearbychathandler.cpp
View File

@ -527,7 +527,8 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, const LLSD &args)
if( nearby_chat->getVisible()
|| ( chat_msg.mSourceType == CHAT_SOURCE_AGENT
&& gSavedSettings.getBOOL("UseChatBubbles") ) )
&& gSavedSettings.getBOOL("UseChatBubbles") )
|| !mChannel->getShowToasts() ) // to prevent toasts in Busy mode
return;//no need in toast if chat is visible or if bubble chat is enabled
// Handle irc styled messages for toast panel

2
indra/newview/llnetmap.cpp
View File

@ -94,10 +94,12 @@ LLNetMap::LLNetMap (const Params & p)
mToolTipMsg()
{
mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
setScale(gSavedSettings.getF32("MiniMapScale"));
}
LLNetMap::~LLNetMap()
{
gSavedSettings.setF32("MiniMapScale", mScale);
}
void LLNetMap::setScale( F32 scale )

8
indra/newview/llpanelmaininventory.cpp
View File

@ -506,9 +506,6 @@ void LLPanelMainInventory::onFilterSelected()
return;
}
BOOL recent_active = ("Recent Items" == mActivePanel->getName());
getChildView("add_btn_panel")->setVisible( !recent_active);
setFilterSubString(mFilterSubString);
LLInventoryFilter* filter = mActivePanel->getFilter();
LLFloaterInventoryFinder *finder = getFinder();
@ -944,6 +941,11 @@ void LLPanelMainInventory::updateListCommands()
void LLPanelMainInventory::onAddButtonClick()
{
// Gray out the "New Folder" option when the Recent tab is active as new folders will not be displayed
// unless "Always show folders" is checked in the filter options.
bool recent_active = ("Recent Items" == mActivePanel->getName());
mMenuAdd->getChild<LLMenuItemGL>("New Folder")->setEnabled(!recent_active);
setUploadCostIfNeeded();
showActionMenu(mMenuAdd,"add_btn");

27
indra/newview/skins/default/xui/en/inspect_object.xml
View File

@ -76,13 +76,24 @@ L$30,000
</text>
<!-- Overlapping buttons for all default actions. Show "Buy" if
for sale, "Sit" if can sit, etc. -->
<icon
name="secure_browsing"
image_name="Lock"
left="0"
visible="false"
width="18"
height="18"
top="103"
tool_tip="Secure Browsing"
follows="left|top" />
<text
follows="all"
font="SansSerifSmall"
height="13"
name="object_media_url"
width="220"
top_pad="0"
width="207"
left_pad="2"
top_delta="0"
max_length = "50"
use_ellipses="true">
http://www.superdupertest.com
@ -135,16 +146,6 @@ L$30,000
name="open_btn"
top_delta="0"
width="80" />
<icon
name="secure_browsing"
image_name="Lock"
left_delta="80"
visible="false"
width="18"
height="18"
top_delta="0"
tool_tip="Secure Browsing"
follows="left|top" />
<!-- non-overlapping buttons here -->
<button
@ -153,7 +154,7 @@ L$30,000
label="More"
layout="topleft"
name="more_info_btn"
left_delta="10"
left_pad="10"
top_delta="0"
tab_stop="false"
width="80" />

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

@ -8,7 +8,7 @@
top="724"
visible="false"
width="128">
<menu_item_call
<menu_item_call
label="Zoom Close"
name="Zoom Close">
<menu_item_call.on_click
@ -29,7 +29,14 @@
function="Minimap.Zoom"
parameter="far" />
</menu_item_call>
<menu_item_separator />
<menu_item_call
label="Zoom Default"
name="Zoom Default">
<menu_item_call.on_click
function="Minimap.Zoom"
parameter="default" />
</menu_item_call>
<menu_item_separator />
<menu_item_check
label="Rotate Map"
name="Rotate Map">

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

@ -94,7 +94,7 @@
left_pad="2"
name="cancel_button"
top_delta="0"
width="70" />
width="65" />
<string
name="GroupInvitation">
Group Invitation

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

@ -117,7 +117,7 @@
name="map_button"
top_delta="-4"
left_pad="0"
width="60"
width="57"
enabled="false" />
<text
type="string"

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

@ -296,6 +296,7 @@
<check_box
name="media_auto_play_btn"
control_name="ParcelMediaAutoPlayEnable"
enabled_control="AudioStreamingMedia"
value="true"
follows="left|bottom|right"
height="15"