summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterpreference.cpp16
-rw-r--r--indra/newview/llfloaterpreference.h1
-rw-r--r--indra/newview/skins/default/textures/textures.xml1
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_item_info.xml262
4 files changed, 153 insertions, 127 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index a333868b8c..ff568a11a9 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -313,8 +313,7 @@ F32 LLFloaterPreference::sAspectRatio = 0.0;
LLFloaterPreference::LLFloaterPreference(const LLSD& key)
: LLFloater(key),
mGotPersonalInfo(false),
- mOriginalIMViaEmail(false),
- mCancelOnClose(true)
+ mOriginalIMViaEmail(false)
{
//Build Floater is now Called from LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
@@ -588,9 +587,6 @@ void LLFloaterPreference::onOpen(const LLSD& key)
// when the floater is opened. That will make cancel do its
// job
saveSettings();
-
- // This is a "fresh" floater, closing floater shoud cancel any changes
- mCancelOnClose = true;
}
void LLFloaterPreference::onVertexShaderEnable()
@@ -609,7 +605,7 @@ void LLFloaterPreference::onClose(bool app_quitting)
{
gSavedSettings.setS32("LastPrefTab", getChild<LLTabContainer>("pref core")->getCurrentPanelIndex());
LLPanelLogin::setAlwaysRefresh(false);
- if (mCancelOnClose) cancel();
+ cancel();
}
void LLFloaterPreference::onOpenHardwareSettings()
@@ -631,16 +627,10 @@ void LLFloaterPreference::onBtnOK()
if (canClose())
{
+ saveSettings();
apply();
- // Here we do not want to cancel on close, so we do this funny thing
- // that prevents cancel from undoing our changes when we hit OK
- mCancelOnClose = false;
closeFloater(false);
- // closeFloater() will be called when viewer is quitting, leaving mCancelOnClose = true;
- // will cancel all changes we saved here, don't let this happen.
- // Fix for EXT-3465
-
gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
LLUIColorTable::instance().saveUserSettings();
std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index d292f3bb7b..94108cb79a 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -148,7 +148,6 @@ private:
static std::string sSkin;
bool mGotPersonalInfo;
bool mOriginalIMViaEmail;
- bool mCancelOnClose;
bool mOriginalHideOnlineStatus;
std::string mDirectoryVisibility;
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 0317d55768..4dbfd5bc81 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -454,6 +454,7 @@ with the same filename but different name
<texture name="SegmentedBtn_Left_Press" file_name="widgets/SegmentedBtn_Left_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="SegmentedBtn_Left_Disabled" file_name="widgets/SegmentedBtn_Left_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="SegmentedBtn_Left_Selected" file_name="widgets/SegmentedBtn_Left_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
+ <texture name="SegmentedBtn_Left_Selected_Over" file_name="widgets/SegmentedBtn_Left_Selected_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="SegmentedBtn_Left_Selected_Press" file_name="widgets/SegmentedBtn_Left_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="SegmentedBtn_Left_Selected_Disabled" file_name="widgets/SegmentedBtn_Left_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index e04af2bad6..7b0b4b0bde 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -6,7 +6,7 @@
name="item properties"
help_topic="item_properties"
save_rect="true"
- title="Inventory Item Properties"
+ title="Object Profile"
width="333">
<panel.string
name="unknown">
@@ -50,15 +50,15 @@
width="23" />
<text
follows="top|left|right"
- font="SansSerifHugeBold"
+ font="SansSerifHuge"
height="26"
layout="topleft"
left_pad="10"
name="title"
- text_color="white"
+ text_color="LtGray"
top="0"
use_ellipses="true"
- value="Item Properties"
+ value="Object Profile"
width="275" />
<panel
follows="all"
@@ -71,7 +71,7 @@
width="313"
background_visible="true"
bg_alpha_color="DkGray2">
- <text
+ <text
type="string"
length="1"
follows="left|top"
@@ -79,7 +79,7 @@
layout="topleft"
left="5"
name="LabelItemNameTitle"
- top="5"
+ top="10"
width="78">
Name:
</text>
@@ -87,7 +87,7 @@
border_style="line"
border_thickness="1"
follows="left|top|right"
- height="16"
+ height="20"
layout="topleft"
left_delta="78"
max_length="63"
@@ -102,7 +102,7 @@
layout="topleft"
left="5"
name="LabelItemDescTitle"
- top_delta="20"
+ top_pad="10"
width="78">
Description:
</text>
@@ -115,7 +115,7 @@
left_delta="78"
max_length="127"
name="LabelItemDesc"
- top_delta="0"
+ top_delta="-5"
width="225" />
<text
type="string"
@@ -123,32 +123,41 @@
follows="left|top"
height="23"
layout="topleft"
- left="10"
+ left="5"
name="LabelCreatorTitle"
- top="65"
+top_pad="10"
width="78">
Creator:
</text>
+ <avatar_icon
+ follows="top|left"
+ height="20"
+ default_icon_name="Generic_Person"
+ layout="topleft"
+ left_pad="0"
+ top_delta="-6"
+ mouse_opaque="true"
+ width="20" />
<text
type="string"
- length="1"
- follows="left|top"
- height="23"
- layout="topleft"
- left_delta="78"
+ follows="left|right"
+ font="SansSerifSmall"
+ height="15"
+ layout="topleft"
+ left_pad="5"
name="LabelCreatorName"
- top_delta="0"
+ top_delta="6"
width="140">
Nicole Linden
</text>
<button
follows="top|right"
height="23"
- label="Profile..."
+ label="Profile"
layout="topleft"
- left_delta="144"
+ right="-1"
name="BtnCreator"
- top_delta="0"
+ top_delta="-6"
width="78" />
<text
type="string"
@@ -156,32 +165,41 @@
follows="left|top"
height="23"
layout="topleft"
- left="10"
+ left="5"
name="LabelOwnerTitle"
- top="85"
+top_pad="5"
width="78">
Owner:
</text>
+ <avatar_icon
+ follows="top|left"
+ height="20"
+ default_icon_name="Generic_Person"
+ layout="topleft"
+ left_pad="0"
+ top_delta="-6"
+ mouse_opaque="true"
+ width="20" />
<text
type="string"
- length="1"
- follows="left|top"
- height="23"
- layout="topleft"
- left_delta="78"
+ follows="left|right"
+ font="SansSerifSmall"
+ height="15"
+ layout="topleft"
+ left_pad="5"
name="LabelOwnerName"
- top_delta="0"
+ top_delta="6"
width="140">
Thrax Linden
</text>
<button
follows="top|right"
height="23"
- label="Profile..."
+ label="Profile"
layout="topleft"
- left_delta="144"
+ right="-1"
name="BtnOwner"
- top_delta="0"
+ top_delta="-3"
width="78" />
<text
type="string"
@@ -189,9 +207,9 @@
follows="left|top"
height="23"
layout="topleft"
- left="10"
+ left="5"
name="LabelAcquiredTitle"
- top="105"
+top_pad="10"
width="78">
Acquired:
</text>
@@ -207,134 +225,146 @@
width="222">
Wed May 24 12:50:46 2006
</text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="23"
- layout="topleft"
- left="10"
- name="OwnerLabel"
- top="125"
- width="78">
- You:
- </text>
+ <panel
+ border="false"
+ follows="left|top"
+ layout="topleft"
+ mouse_opaque="false"
+ background_visible="true"
+ bg_alpha_color="DkGray"
+ name="perms_inv"
+ left="0"
+ top_pad="25"
+ height="155"
+ width="313">
+ <text
+ type="string"
+ length="1"
+ left="10"
+ top_pad="13"
+ text_color="EmphasisColor"
+ height="15"
+ follows="left|top|right"
+ layout="topleft"
+ name="perm_modify"
+ width="200">
+ You can:
+ </text>
<check_box
- height="23"
- label="Edit"
+ height="18"
+ label="Modify"
layout="topleft"
- left_pad="5"
+ left="20"
name="CheckOwnerModify"
- top_delta="0"
- width="78" />
+ top_pad="0"
+ width="90" />
<check_box
- height="23"
+ height="18"
label="Copy"
layout="topleft"
- left_delta="0"
+ left_pad="0"
name="CheckOwnerCopy"
- top_pad="5"
- width="88" />
+ width="90" />
<check_box
- height="23"
- label="Resell"
+ height="18"
+ label="Transfer"
layout="topleft"
- left_delta="0"
+ left_pad="0"
name="CheckOwnerTransfer"
- top_pad="5"
width="106" />
<text
type="string"
length="1"
follows="left|top"
- height="10"
+ height="16"
layout="topleft"
left="10"
name="AnyoneLabel"
- top_pad="5"
- width="78">
+ top_pad="8"
+ width="100">
Anyone:
</text>
<check_box
- height="16"
+ height="18"
label="Copy"
layout="topleft"
- left_pad="5"
+ left_pad="0"
name="CheckEveryoneCopy"
- top_delta="0"
- width="130" />
+ top_delta="-2"
+ width="150" />
<text
type="string"
length="1"
follows="left|top"
- height="10"
+ height="16"
layout="topleft"
left="10"
name="GroupLabel"
- top_pad="5"
- width="78">
+ top_pad="8"
+ width="100">
Group:
</text>
<check_box
- height="16"
+ height="18"
label="Share"
layout="topleft"
- left_pad="5"
+ left_pad="0"
+ top_delta="-2"
name="CheckShareWithGroup"
- top_delta="5"
- width="106" />
+ tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+ width="150" />
<text
type="string"
length="1"
follows="left|top"
- height="25"
+ height="16"
layout="topleft"
left="10"
name="NextOwnerLabel"
- top_pad="5"
- width="78"
+ top_pad="8"
+ width="200"
word_wrap="true">
Next owner:
</text>
<check_box
- height="16"
- label="Edit"
+ height="18"
+ label="Modify"
layout="topleft"
- left_pad="5"
+ left="20"
+ top_pad="0"
name="CheckNextOwnerModify"
- top_delta="0"
- width="78" />
+ width="90" />
<check_box
- height="16"
+ height="18"
label="Copy"
layout="topleft"
- left_delta="0"
+ left_pad="0"
name="CheckNextOwnerCopy"
- top_pad="5"
- width="88" />
+ width="90" />
<check_box
- height="16"
- label="Resell"
+ height="18"
+ label="Transfer"
layout="topleft"
- left_delta="0"
+ left_pad="0"
name="CheckNextOwnerTransfer"
- top_pad="5"
+ tool_tip="Next owner can give away or resell this object"
width="106" />
+ </panel>
<check_box
- height="16"
+ height="18"
label="For Sale"
layout="topleft"
- left="10"
+ left="20"
name="CheckPurchase"
- top_pad="5"
- width="78" />
+ top_pad="20"
+ width="100" />
<combo_box
- height="19"
- left_pad="5"
+ height="23"
+ left_pad="0"
layout="topleft"
follows="left|top"
name="combobox sale copy"
- width="110">
+ width="170">
<combo_box.item
label="Copy"
name="Copy"
@@ -350,26 +380,14 @@
increment="1"
control_name="Edit Cost"
name="Edit Cost"
- label="Price:"
- label_width="100"
- left="10"
- width="192"
+ label="Price: L$"
+ label_width="75"
+ left="120"
+ width="170"
min_val="1"
- height="19"
+ height="23"
max_val="999999999"
- top_pad="5"/>
- <text
- type="string"
- length="1"
- height="15"
- follows="left|top"
- layout="topleft"
- left_delta="82"
- name="CurrencySymbol"
- top_delta="1"
- width="18">
- L$
- </text>
+ top_pad="10"/>
<!--line_editor
border_style="line"
border_thickness="1"
@@ -492,4 +510,22 @@
Price: L$
</text-->
</panel>
+ <panel
+ height="25"
+ layout="bottomright"
+ help_topic="button_tab"
+ name="button_panel"
+ left="5"
+ bottom="5"
+ width="313">
+ <button
+ follows="bottom|right"
+ height="25"
+ label="Cancel"
+ layout="topleft"
+ name="cancel_btn"
+ right="-1"
+ left_pad="10"
+ width="100" />
+ </panel>
</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 14:00:18 +0000