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

Merged in viewer-development changes

meow-7.2.2
Squire 2011-06-28 11:48:25 -07:00
parent df91a44d29 3bc99274f1
commit 03969822f5
10 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.hgtags
View File

@ -122,24 +122,22 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release
8f2da1701c81a62352df2b8d413d27fb2cade9a6 DRTVWR-46_2.6.3-release
8f2da1701c81a62352df2b8d413d27fb2cade9a6 2.6.3-release
77e5a08344c95738ab879f9671b7758cddd712a3 DRTVWR-56_2.6.9-release
77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-release
8835e0e3c0d3a48244c287bc05811dfc2fba43ec 2.7.0-start
43c7ee846b7eed80786acbbf35d03bd016a3e85d DRTVWR-59_2.7.0-beta1
43c7ee846b7eed80786acbbf35d03bd016a3e85d 2.7.0-beta1
77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-release
54fd44ac92e4c61435ea33effe093a3527e18d98 2.7.1-start
0c4d0c24278074f219e5a32e72b449e78301d11b DRTVWR-61_2.7.1-beta1
0c4d0c24278074f219e5a32e72b449e78301d11b 2.7.1-beta1
8f2da1701c81a62352df2b8d413d27fb2cade9a6 DRTVWR-46_2.6.3-release
8f2da1701c81a62352df2b8d413d27fb2cade9a6 2.6.3-release
77e5a08344c95738ab879f9671b7758cddd712a3 DRTVWR-56_2.6.9-release
9f79a6ed8fdcd2f3dac33ea6b3236eeb278dccfe 2.7.2-start
e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb DRTVWR-63_2.7.2-beta1
e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb 2.7.2-beta1
6a3e7e403bd19e45fdfc2fcc716867af3ab80861 2.7.3-start
6af10678de4736222b2c3f7e010e984fb5b327de 2.7.4-start
77e5a08344c95738ab879f9671b7758cddd712a3 2.6.9-release
be963a4eef635542f9617d7f5fd22ba48fb71958 DRTVWR-67_2.7.4-beta1
be963a4eef635542f9617d7f5fd22ba48fb71958 2.7.4-beta1
a9abb9633a266c8d2fe62411cfd1c86d32da72bf DRTVWR-60_2.7.1-release
be963a4eef635542f9617d7f5fd22ba48fb71958 DRTVWR-67_2.7.4-beta1
be963a4eef635542f9617d7f5fd22ba48fb71958 2.7.4-beta1
a9abb9633a266c8d2fe62411cfd1c86d32da72bf 2.7.1-release
e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb DRTVWR-63_2.7.2-beta1
e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb 2.7.2-beta1
19a498fa62570f352d7d246f17e3c81cc1d82d8b 2.7.5-start

4
doc/contributions.txt
View File

@ -158,6 +158,7 @@ Ann Congrejo
CT-193
Ansariel Hiller
STORM-1101
VWR-25480
Ardy Lay
STORM-859
VWR-19499
@ -443,6 +444,8 @@ Jonathan Yap
STORM-1236
STORM-1259
STORM-787
VWR-25480
STORM-1334
STORM-1313
STORM-899
STORM-1273
@ -910,6 +913,7 @@ WolfPup Lowenhar
STORM-825
STORM-859
STORM-1098
STORM-1393
VWR-20741
VWR-20933
Zai Lynch

13
indra/llui/llconsole.cpp
View File

@ -132,6 +132,9 @@ void LLConsole::setFontSize(S32 size_index)
void LLConsole::draw()
{
// Units in pixels
static const F32 padding_horizontal = 10;
static const F32 padding_vertical = 3;
LLGLSUIDefault gls_ui;
// skip lines added more than mLinePersistTime ago
@ -176,11 +179,9 @@ void LLConsole::draw()
// draw remaining lines
F32 y_pos = 0.f;
LLUIImagePtr imagep = LLUI::getUIImage("Rounded_Square");
LLUIImagePtr imagep = LLUI::getUIImage("transparent");
// F32 console_opacity = llclamp(gSavedSettings.getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
F32 console_opacity = llclamp(LLUI::sSettingGroups["config"]->getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
// LLColor4 color = LLUIColorTable::instance().getColor("ConsoleBackground");
LLColor4 color = LLUIColorTable::instance().getColor("ConsoleBackground");
color.mV[VALPHA] *= console_opacity;
@ -188,8 +189,8 @@ void LLConsole::draw()
for(paragraph_it = mParagraphs.rbegin(); paragraph_it != mParagraphs.rend(); paragraph_it++)
{
S32 target_height = llfloor( (*paragraph_it).mLines.size() * line_height + 8);
S32 target_width = llfloor( (*paragraph_it).mMaxWidth +15);
S32 target_height = llfloor( (*paragraph_it).mLines.size() * line_height + padding_vertical);
S32 target_width = llfloor( (*paragraph_it).mMaxWidth + padding_horizontal);
y_pos += ((*paragraph_it).mLines.size()) * line_height;
imagep->drawSolid(-14, (S32)(y_pos + line_height - target_height), target_width, target_height, color);
@ -234,7 +235,7 @@ void LLConsole::draw()
y_off += line_height;
}
}
y_pos += 8;
y_pos += padding_vertical;
}
}

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

@ -5576,7 +5576,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<real>1</real>
<real>0</real>
</map>
<key>MeshImportUseSLM</key>
<map>

3
indra/newview/lldebugview.cpp
View File

@ -62,7 +62,8 @@ void LLDebugView::init()
LLRect r;
LLRect rect = getLocalRect();
r.set(10, rect.getHeight() - 100, rect.getWidth()/2, 100);
// Rectangle to draw debug data in (full height, 3/4 width)
r.set(10, rect.getHeight() - 100, ((rect.getWidth()*3)/4), 100);
LLConsole::Params cp;
cp.name("debug console");
cp.max_lines(20);

4
indra/newview/llfloatertools.cpp
View File

@ -424,8 +424,7 @@ void LLFloaterTools::refresh()
// Refresh object and prim count labels
LLLocale locale(LLLocale::USER_LOCALE);
#if 0
if (gMeshRepo.meshRezEnabled())
if (!gMeshRepo.meshRezEnabled())
{
std::string obj_count_string;
LLResMgr::getInstance()->getIntegerString(obj_count_string, LLSelectMgr::getInstance()->getSelection()->getRootObjectCount());
@ -449,7 +448,6 @@ void LLFloaterTools::refresh()
getChildView("RenderingCost")->setEnabled(have_selection && sShowObjectCost);
}
else
#endif
{
// Get the number of objects selected
std::string root_object_count_string;

19
indra/newview/llfloaterworldmap.cpp
View File

@ -1527,17 +1527,24 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
mCompletingRegionName = "";
}
// if match found, highlight it and go
if (!match.isUndefined())
if (num_results > 0)
{
list->selectByValue(match);
// if match found, highlight it and go
if (!match.isUndefined())
{
list->selectByValue(match);
}
// else select first found item
else
{
list->selectFirstItem();
}
getChild<LLUICtrl>("search_results")->setFocus(TRUE);
onCommitSearchResult();
}
// if we found nothing, say "none"
if (num_results == 0)
else
{
// if we found nothing, say "none"
list->setCommentText(LLTrans::getString("worldmap_results_none_found"));
list->operateOnAll(LLCtrlListInterface::OP_DESELECT);
}

6
indra/newview/llviewermessage.cpp
View File

@ -1501,7 +1501,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString(".");
LLSD args;
args["MESSAGE"] = log_message;
LLNotificationsUtil::add("SystemMessage", args);
LLNotificationsUtil::add("SystemMessageTip", args);
}
break;
@ -1675,7 +1675,7 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString(".");
LLSD args;
args["MESSAGE"] = log_message;
LLNotificationsUtil::add("SystemMessage", args);
LLNotificationsUtil::add("SystemMessageTip", args);
}
// we will want to open this item when it comes back.
@ -1726,7 +1726,7 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
LLSD args;
args["MESSAGE"] = log_message;
LLNotificationsUtil::add("SystemMessage", args);
LLNotificationsUtil::add("SystemMessageTip", args);
}
if (busy && (!mFromGroup && !mFromObject))

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

@ -135,6 +135,14 @@
name="login_panel_holder"
width="1024"/>
<debug_view follows="all"
left="0"
top="0"
mouse_opaque="false"
height="500"
name="DebugView"
width="1024"/>
<panel follows="all"
height="500"
left="0"
@ -154,13 +162,6 @@
top="0"
width="1024"/>
</panel>
<debug_view follows="all"
left="0"
top="0"
mouse_opaque="false"
height="500"
name="DebugView"
width="1024"/>
</layout_panel>
</layout_stack>
<panel mouse_opaque="false"

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

@ -110,8 +110,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
<layout_panel
height="142"
layout="topleft"
min_dim="100"
mouse_opaque="false"
user_resize="false"
user_resize="true"
visibility_control="NearbyListShowMap"
width="313">
<net_map
@ -128,9 +129,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
<layout_panel
height="213"
layout="topleft"
min_height="100"
min_dim="100"
mouse_opaque="false"
user_resize="false"
user_resize="true"
width="313">
<avatar_list
allow_select="true"