summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/llcommon/llfoldertype.cpp1
-rw-r--r--indra/llcommon/llfoldertype.h3
-rw-r--r--indra/newview/llviewerfoldertype.cpp1
-rw-r--r--indra/newview/llviewerinventory.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/menu_inventory_add.xml16
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml102
6 files changed, 77 insertions, 48 deletions
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp
index ebc79af412..f5b3883f43 100644
--- a/indra/llcommon/llfoldertype.cpp
+++ b/indra/llcommon/llfoldertype.cpp
@@ -90,6 +90,7 @@ LLFolderDictionary::LLFolderDictionary()
addEntry(LLFolderType::FT_OUTFIT, new FolderEntry("outfit", FALSE));
addEntry(LLFolderType::FT_MY_OUTFITS, new FolderEntry("my_otfts", TRUE));
addEntry(LLFolderType::FT_INBOX, new FolderEntry("inbox", TRUE));
+ addEntry(LLFolderType::FT_OUTBOX, new FolderEntry("outbox", TRUE));
addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE));
};
diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h
index 936fbed17d..71e9338883 100644
--- a/indra/llcommon/llfoldertype.h
+++ b/indra/llcommon/llfoldertype.h
@@ -81,8 +81,9 @@ public:
FT_MY_OUTFITS = 48,
FT_INBOX = 49,
+ FT_OUTBOX = 50,
- FT_COUNT = 50,
+ FT_COUNT = 51,
FT_NONE = -1
};
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index 1623357c90..7e0e510c07 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -131,6 +131,7 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
addEntry(LLFolderType::FT_OUTFIT, new ViewerFolderEntry("New Outfit", "Inv_LookFolderOpen", "Inv_LookFolderClosed", TRUE));
addEntry(LLFolderType::FT_MY_OUTFITS, new ViewerFolderEntry("My Outfits", "Inv_SysOpen", "Inv_SysClosed", TRUE));
addEntry(LLFolderType::FT_INBOX, new ViewerFolderEntry("Inbox", "Inv_SysOpen", "Inv_SysClosed", FALSE, true));
+ addEntry(LLFolderType::FT_OUTBOX, new ViewerFolderEntry("Outbox", "Inv_SysOpen", "Inv_SysClosed", FALSE, true));
addEntry(LLFolderType::FT_NONE, new ViewerFolderEntry("New Folder", "Inv_FolderOpen", "Inv_FolderClosed", FALSE, false, "default"));
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 9e58acdcd3..22666cec0d 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1269,7 +1269,7 @@ void menu_create_inventory_item(LLFolderView* root, LLFolderBridge *bridge, cons
{
std::string type_name = userdata.asString();
- if (("category" == type_name) || ("current" == type_name) || ("outfit" == type_name) || ("my_otfts" == type_name))
+ if (("inbox" == type_name) || ("outbox" == type_name) || ("category" == type_name) || ("current" == type_name) || ("outfit" == type_name) || ("my_otfts" == type_name))
{
LLFolderType::EType preferred_type = LLFolderType::lookup(type_name);
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 90e8db3709..30eff8e6a7 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -67,6 +67,22 @@
function="Inventory.DoCreate"
parameter="category" />
</menu_item_call>
+ <menu_item_call
+ label="Inbox"
+ layout="topleft"
+ name="Inbox">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="inbox" />
+</menu_item_call>
+ <menu_item_call
+ label="Outbox"
+ layout="topleft"
+ name="Outbox">
+ <menu_item_call.on_click
+ function="Inventory.DoCreate"
+ parameter="outbox" />
+</menu_item_call>
<menu_item_call
label="New Script"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 484e90f083..49c45233d8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -26,13 +26,13 @@
top="0"
orientation="vertical"
name="inventory_layout_stack"
- height="535"
+ height="535"
width="330">
<layout_panel
name="main_inventory_layout_panel"
min_dim="150"
width="330"
- follows="bottom|left|right"
+ follows="bottom|left|right"
user_resize="false"
height="480">
<panel
@@ -48,14 +48,14 @@
width="330" />
</layout_panel>
<layout_panel
- width="330"
- auto_resize="true"
- user_resize="false"
- follows="bottom|left|right"
- min_dim="35"
- name="inbox_layout_panel"
- max_dim="125"
- height="35">
+ width="330"
+ auto_resize="true"
+ user_resize="false"
+ follows="bottom|left|right"
+ min_dim="35"
+ name="inbox_layout_panel"
+ max_dim="125"
+ height="35">
<panel
follows="all"
layout="topleft"
@@ -72,14 +72,14 @@
height="35"
width="308"
image_unselected="MarketplaceBtn_Off"
- image_selected="MarketplaceBtn_Selected"
+ image_selected="MarketplaceBtn_Selected"
halign="left"
follows="top|left|right"
is_toggle="true"
tab_stop="false"
pad_left="35"
top="0"
- left="10" />
+ left="10" />
<panel
follows="all"
left="10"
@@ -99,7 +99,7 @@
start_folder="Inbox"
layout="topleft"
left="0"
- name="All Items"
+ name="inventory_inbox"
sort_order_setting="InventorySortOrder"
show_item_link_overlays="true"
top="0"
@@ -108,16 +108,16 @@
</panel>
</layout_panel>
<layout_panel
- width="330"
- auto_resize="true"
+ width="330"
+ auto_resize="true"
user_resize="false"
- follows="bottom|left|right"
- name="outbox_layout_panel"
- min_dim="35"
- max_dim="125"
- height="35">
+ follows="bottom|left|right"
+ name="outbox_layout_panel"
+ min_dim="35"
+ max_dim="125"
+ height="35">
<panel
- follows="top|left|right"
+ follows="all"
layout="topleft"
left="10"
name="marketplace_outbox"
@@ -127,20 +127,20 @@
height="125"
width="310">
<button
- label="MARKETPLACE OUTBOX"
- is_toggle="true"
- name="outbox_btn"
- follows="top|left|right"
- image_unselected="MarketplaceBtn_Off"
- image_selected="MarketplaceBtn_Selected"
- height="35"
- tab_stop="false"
- width="308"
- halign="left"
- pad_left="35"
- top="0"
+ label="MARKETPLACE OUTBOX"
+ is_toggle="true"
+ name="outbox_btn"
+ follows="top|left|right"
+ image_unselected="MarketplaceBtn_Off"
+ image_selected="MarketplaceBtn_Selected"
+ height="35"
+ tab_stop="false"
+ width="308"
+ halign="left"
+ pad_left="35"
+ top="0"
left="0" />
- <button
+ <button
image_disabled="Sync_Disabled"
image_disabled_selected="Sync_Disabled"
image_unselected="Sync_Enabled"
@@ -176,19 +176,29 @@
</images>
</loading_indicator>
<panel
- follows="all"
- left="0"
- height="90"
- width="250"
- top="30"
+ follows="all"
+ left="0"
+ height="90"
+ width="330"
+ top="35"
>
- <text
- left ="40"
- top="15"
- align="left"
- height="14"
- width="100"
- >Just a panel</text>
+ <inventory_panel
+ bg_opaque_color="DkGray2"
+ bg_alpha_color="DkGray2"
+ background_visible="true"
+ background_opaque="true"
+ border="false"
+ bevel_style="none"
+ follows="all"
+ height="90"
+ start_folder="Outbox"
+ layout="topleft"
+ left="0"
+ name="inventory_outbox"
+ sort_order_setting="InventorySortOrder"
+ show_item_link_overlays="true"
+ top="0"
+ width="308" />
</panel>
</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 09:57:10 +0000