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

merge

meow-7.2.2
angela 2009-11-20 09:55:19 +08:00
parent 496ad115b1 53f4bedaa5
commit d670d84147
9 changed files with 99 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llui/llfloater.cpp
View File

@ -2526,8 +2526,12 @@ void LLFloaterView::pushVisibleAll(BOOL visible, const skip_list_t& skip_list)
void LLFloaterView::popVisibleAll(const skip_list_t& skip_list)
{
for (child_list_const_iter_t child_iter = getChildList()->begin();
child_iter != getChildList()->end(); ++child_iter)
// make a copy of the list since some floaters change their
// order in the childList when changing visibility.
child_list_t child_list_copy = *getChildList();
for (child_list_const_iter_t child_iter = child_list_copy.begin();
child_iter != child_list_copy.end(); ++child_iter)
{
LLView *view = *child_iter;
if (skip_list.find(view) == skip_list.end())

6
indra/newview/llagent.cpp
View File

@ -2810,7 +2810,11 @@ void LLAgent::endAnimationUpdateUI()
LLFloaterReg::restoreVisibleInstances();
#else // Use this for now
LLFloaterView::skip_list_t skip_list;
skip_list.insert(LLFloaterReg::findInstance("mini_map"));
if (LLFloaterReg::findInstance("mini_map"))
{
skip_list.insert(LLFloaterReg::findInstance("mini_map"));
}
gFloaterView->popVisibleAll(skip_list);
#endif
mViewsPushed = FALSE;

13
indra/newview/llpanelobjectinventory.cpp
View File

@ -1158,10 +1158,17 @@ void LLTaskLSLBridge::openItem()
{
return;
}
LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", LLSD(mUUID), TAKE_FOCUS_YES);
if (preview && (object->permModify() || gAgent.isGodlike()))
if (object->permModify() || gAgent.isGodlike())
{
preview->setObjectID(mPanel->getTaskUUID());
LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", LLSD(mUUID), TAKE_FOCUS_YES);
if (preview)
{
preview->setObjectID(mPanel->getTaskUUID());
}
}
else
{
LLNotifications::instance().add("CannotOpenScriptObjectNoMod");
}
}

15
indra/newview/llviewermenu.cpp
View File

@ -2733,15 +2733,26 @@ bool enable_object_edit()
// there. Eventually this needs to be replaced with code that only
// lets you edit objects if you have permission to do so (edit perms,
// group edit, god). See also lltoolbar.cpp. JC
bool enable = true;
bool enable = false;
if (gAgent.inPrelude())
{
enable = LLViewerParcelMgr::getInstance()->agentCanBuild()
|| LLSelectMgr::getInstance()->getSelection()->isAttachment();
}
else if (LLSelectMgr::getInstance()->selectGetModify())
{
enable = true;
}
return enable;
}
// mutually exclusive - show either edit option or build in menu
bool enable_object_build()
{
return !enable_object_edit();
}
class LLSelfRemoveAllAttachments : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@ -8023,6 +8034,8 @@ void initialize_menus()
visible.add("VisiblePayObject", boost::bind(&enable_pay_object));
enable.add("EnablePayAvatar", boost::bind(&enable_pay_avatar));
enable.add("EnableEdit", boost::bind(&enable_object_edit));
visible.add("VisibleBuild", boost::bind(&enable_object_build));
visible.add("VisibleEdit", boost::bind(&enable_object_edit));
visible.add("Object.VisibleEdit", boost::bind(&enable_object_edit));
view_listener_t::addMenu(new LLFloaterVisible(), "FloaterVisible");

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

@ -56,7 +56,7 @@
<text
type="string"
length="1"
follows="left|top"
follows="left|bottom"
font="SansSerif"
height="16"
layout="topleft"
@ -68,7 +68,7 @@
Buy for L$[AMOUNT] from [NAME]?
</text>
<check_box
follows="left|top"
follows="left|bottom"
height="16"
label="Wear clothing now"
layout="topleft"

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
height="512"
height="555"
help_topic="regioninfo"
layout="topleft"
name="regioninfo"
@ -9,7 +9,7 @@
title="REGION/ESTATE"
width="480">
<tab_container
bottom="512"
bottom="555"
follows="left|right|top|bottom"
layout="topleft"
left="1"

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

@ -18,7 +18,7 @@
height="150"
layout="topleft"
left="60"
name=""
name="screenshot"
top="15"
width="220" />
<check_box

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

@ -1434,6 +1434,13 @@ Not able to perform &apos;reset&apos;.
Select objects with scripts that you have permission to modify.
</notification>
<notification
icon="alertmodal.tga"
name="CannotOpenScriptObjectNoMod"
type="alertmodal">
Unable to open script in object without modify permissions.
</notification>
<notification
icon="alertmodal.tga"
name="CannotSetRunningSelectObjectsNoScripts"

104
indra/newview/skins/default/xui/en/panel_region_estate.xml
View File

@ -81,7 +81,7 @@ regions in the estate.
<view_border
bevel_style="in"
follows="top|left"
height="290"
height="310"
layout="topleft"
left_delta="-4"
top_pad="5"
@ -185,48 +185,48 @@ regions in the estate.
follows="left|top"
height="20"
layout="topleft"
left="10"
left="15"
name="abuse_email_text"
top_pad="5"
top_pad="10"
width="180">
Abuse email address:
</text>
<line_editor
follows="top|left"
height="19"
height="23"
layout="topleft"
left="15"
name="abuse_email_address"
top_pad="5"
width="205" />
top_pad="-5"
width="230" />
<button
enabled="false"
follows="left|top"
height="20"
height="23"
label="Apply"
layout="topleft"
name="apply_btn"
right="250"
top_pad="4"
width="90" />
top_pad="10"
left="78"
width="97" />
<button
follows="left|top"
height="20"
height="23"
label="Send Message To Estate..."
layout="topleft"
left="8"
left="50"
name="message_estate_btn"
top_pad="5"
width="250" />
top_pad="20"
width="160" />
<button
follows="left|top"
height="20"
height="23"
label="Kick User from Estate..."
layout="topleft"
left="8"
left="50"
name="kick_user_from_estate_btn"
top_pad="5"
width="250" />
width="160" />
<text
type="string"
@ -243,14 +243,14 @@ regions in the estate.
<view_border
bevel_style="none"
follows="top|left"
height="60"
height="71"
layout="topleft"
right="470"
top_pad="5"
top_pad="-5"
width="200" />
<name_list
follows="left|top"
height="60"
height="71"
layout="topleft"
left_delta="0"
multi_select="true"
@ -259,22 +259,22 @@ regions in the estate.
width="200" />
<button
follows="left|top"
height="20"
height="23"
label="Remove..."
layout="topleft"
name="remove_estate_manager_btn"
right="470"
top_pad="5"
width="90" />
width="97" />
<button
follows="left|top"
height="20"
height="23"
label="Add..."
layout="topleft"
left_delta="-110"
left_delta="-103"
name="add_estate_manager_btn"
top_delta="0"
width="90" />
width="97" />
<text
type="string"
length="1"
@ -283,21 +283,21 @@ regions in the estate.
layout="topleft"
left_delta="0"
name="allow_resident_label"
top_pad="5"
top_pad="10"
width="200">
Allowed Residents:
</text>
<view_border
bevel_style="none"
follows="top|left"
height="60"
height="71"
layout="topleft"
right="470"
top_pad="5"
top_pad="-5"
width="200" />
<name_list
follows="left|top"
height="60"
height="71"
layout="topleft"
left_delta="0"
multi_select="true"
@ -306,22 +306,22 @@ regions in the estate.
width="200" />
<button
follows="left|top"
height="20"
height="23"
label="Remove..."
layout="topleft"
name="remove_allowed_avatar_btn"
right="470"
top_pad="5"
width="90" />
width="97" />
<button
follows="left|top"
height="20"
height="23"
label="Add..."
layout="topleft"
left_delta="-110"
left_delta="-103"
name="add_allowed_avatar_btn"
top_delta="0"
width="90" />
width="97" />
<text
type="string"
length="1"
@ -330,21 +330,21 @@ regions in the estate.
layout="topleft"
left_delta="0"
name="allow_group_label"
top_pad="5"
top_pad="10"
width="200">
Allowed Groups:
</text>
<view_border
bevel_style="none"
follows="top|left"
height="60"
height="71"
layout="topleft"
right="470"
top_pad="5"
top_pad="-5"
width="200" />
<name_list
follows="left|top"
height="60"
height="71"
layout="topleft"
left_delta="0"
multi_select="true"
@ -353,22 +353,22 @@ regions in the estate.
width="200" />
<button
follows="left|top"
height="20"
height="23"
label="Remove..."
layout="topleft"
name="remove_allowed_group_btn"
right="470"
top_pad="5"
width="90" />
width="97" />
<button
follows="left|top"
height="20"
height="23"
label="Add..."
layout="topleft"
left_delta="-110"
left_delta="-103"
name="add_allowed_group_btn"
top_delta="0"
width="90" />
width="97" />
<text
type="string"
length="1"
@ -377,21 +377,21 @@ regions in the estate.
layout="topleft"
left_delta="0"
name="ban_resident_label"
top_pad="5"
top_pad="10"
width="200">
Banned Residents:
</text>
<view_border
bevel_style="none"
follows="top|left"
height="60"
height="71"
layout="topleft"
right="470"
top_pad="5"
top_pad="-5"
width="200" />
<name_list
follows="left|top"
height="60"
height="71"
layout="topleft"
left_delta="0"
multi_select="true"
@ -400,20 +400,20 @@ regions in the estate.
width="200" />
<button
follows="left|top"
height="20"
height="23"
label="Remove..."
layout="topleft"
name="remove_banned_avatar_btn"
right="470"
top_pad="5"
width="90" />
width="97" />
<button
follows="left|top"
height="20"
height="23"
label="Add..."
layout="topleft"
left_delta="-110"
left_delta="-103"
name="add_banned_avatar_btn"
top_delta="0"
width="90" />
width="97" />
</panel>