diff --git a/FIRESTORM-FEATURETABLE.txt b/FIRESTORM-FEATURETABLE.txt
index acfc439e05..40116d6d58 100644
--- a/FIRESTORM-FEATURETABLE.txt
+++ b/FIRESTORM-FEATURETABLE.txt
@@ -44,4 +44,8 @@ V1_MouseCursors LGPL/Creative Commons Attribution-Share Alike 3.0
V1_Icons Creative Commons Attribution-Share Alike 3.0
AFK_ExtraControls LGPL
IgnoreFinishAnimation BSD/PD
-V1_Contacts LGPL
\ No newline at end of file
+V1_Contacts LGPL
+QuickAdditionalInv LGPL
+UpdatedLibCURL Curl (MIT/X11)
+UpdatedWebKit LGPL
+Progress_screens LGPL
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 73428cb36e..3dea67694e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6620,7 +6620,7 @@
Type
Boolean
Value
- 0
+ 1
PluginInstancesLow
@@ -12996,5 +12996,38 @@
Value
0
+ PhoenixDisableLoginScreens
+
+ PhoenixDisableLogoutScreens
+
+ PhoenixDisableTeleportScreens
+
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index ed7168f3b4..9ef0783347 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4107,7 +4107,7 @@ void LLAppViewer::idleShutdown()
static S32 total_uploads = 0;
// Sometimes total upload count can change during logout.
total_uploads = llmax(total_uploads, pending_uploads);
- gViewerWindow->setShowProgress(TRUE);
+ gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("PhoenixDisableLogoutScreens"));
S32 finished_uploads = total_uploads - pending_uploads;
F32 percent = 100.f * finished_uploads / total_uploads;
gViewerWindow->setProgressPercent(percent);
@@ -4121,7 +4121,7 @@ void LLAppViewer::idleShutdown()
sendLogoutRequest();
// Wait for a LogoutReply message
- gViewerWindow->setShowProgress(TRUE);
+ gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("PhoenixDisableLogoutScreens"));
gViewerWindow->setProgressPercent(100.f);
gViewerWindow->setProgressString(LLTrans::getString("LoggingOut"));
return;
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 4e69cf2d74..3ff8c705fc 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -577,6 +577,7 @@ BOOL LLBottomTray::postBuild()
getChild("sidebar_people_btn")->setCommitCallback(boost::bind(&LLBottomTray::showSidebarPanel, this, "panel_people"));
getChild("sidebar_places_btn")->setCommitCallback(boost::bind(&LLBottomTray::showSidebarPanel, this, "panel_places"));
getChild("sidebar_appearance_btn")->setCommitCallback(boost::bind(&LLBottomTray::showSidebarPanel, this, "sidepanel_appearance"));
+ getChild("sidebar_inv_btn")->setCommitCallback(boost::bind(&LLBottomTray::showSidebarPanel, this, "sidepanel_inventory"));
return TRUE;
}
@@ -887,6 +888,11 @@ void LLBottomTray::showSidebarPanel(const std::string& panel_name)
tab_name = "sidebar_appearance";
btn = getChild("sidebar_appearance_btn");
}
+ else if (panel_name == "sidepanel_inventory")
+ {
+ tab_name = "sidebar_inventory";
+ btn = getChild("sidebar_inv_btn");
+ }
// toggle minimization undocked
LLFloater* floater_tab = LLFloaterReg::getInstance("side_bar_tab", tab_name);
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index a5cd803866..0bb7f3a42f 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1766,6 +1766,7 @@ void LLPanelPreferenceSkins::onSkinChanged()
m_Skin = (m_pSkinCombo) ? m_pSkinCombo->getSelectedValue().asString() : "default";
m_SkinTheme = "default";
refreshSkinThemeList();
+ onSkinThemeChanged(); // make sure we initialize a theme for our new skin
}
void LLPanelPreferenceSkins::onSkinThemeChanged()
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index c3e6e1c2dc..8ebb15d48a 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -65,20 +65,28 @@ public:
static const LLGroupComparator GROUP_COMPARATOR;
+LLGroupList::Params::Params()
+: for_agent("for_agent", true)
+{
+}
LLGroupList::LLGroupList(const Params& p)
-: LLFlatListViewEx(p)
+: LLFlatListViewEx(p),
+ mForAgent(p.for_agent)
, mDirty(true) // to force initial update
{
// Listen for agent group changes.
- gAgent.addListener(this, "new group");
+ if (mForAgent) gAgent.addListener(this, "new group");
- mShowIcons = gSavedSettings.getBOOL("GroupListShowIcons");
+ mShowIcons = mForAgent && gSavedSettings.getBOOL("GroupListShowIcons");
setCommitOnSelectionChange(true);
// Set default sort order.
setComparator(&GROUP_COMPARATOR);
+
+ if (mForAgent)
+ {
// Set up context menu.
LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
@@ -90,11 +98,12 @@ LLGroupList::LLGroupList(const Params& p)
gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
if(context_menu)
mContextMenuHandle = context_menu->getHandle();
+ }
}
LLGroupList::~LLGroupList()
{
- gAgent.removeListener(this);
+ if (mForAgent) gAgent.removeListener(this);
LLView::deleteViewByHandle(mContextMenuHandle);
}
@@ -112,6 +121,8 @@ BOOL LLGroupList::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask);
+ if (mForAgent)
+ {
LLMenuGL* context_menu = (LLMenuGL*)mContextMenuHandle.get();
if (context_menu && size() > 0)
{
@@ -119,6 +130,7 @@ BOOL LLGroupList::handleRightMouseDown(S32 x, S32 y, MASK mask)
context_menu->updateParent(LLMenuGL::sMenuContainer);
LLMenuGL::showPopup(this, context_menu, x, y);
}
+ }
return handled;
}
@@ -146,6 +158,8 @@ static bool findInsensitive(std::string haystack, const std::string& needle_uppe
void LLGroupList::refresh()
{
+ if (mForAgent)
+ {
const LLUUID& highlight_id = gAgent.getGroupID();
S32 count = gAgent.mGroups.count();
LLUUID id;
@@ -174,6 +188,19 @@ void LLGroupList::refresh()
}
selectItemByUUID(highlight_id);
+ }
+ else
+ {
+ clear();
+
+ for (group_map_t::iterator it = mGroups.begin(); it != mGroups.end(); ++it)
+ {
+ addNewItem(it->second, it->first, LLUUID::null, ADD_BOTTOM);
+ }
+
+ // Sort the list.
+ sort();
+ }
setDirty(false);
onCommit();
@@ -194,6 +221,12 @@ void LLGroupList::toggleIcons()
}
}
+void LLGroupList::setGroups(const std::map< std::string,LLUUID> group_list)
+{
+ mGroups = group_list;
+ setDirty(true);
+}
+
//////////////////////////////////////////////////////////////////////////
// PRIVATE Section
//////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h
index d7051db891..8da6210862 100644
--- a/indra/newview/llgrouplist.h
+++ b/indra/newview/llgrouplist.h
@@ -45,6 +45,11 @@ class LLGroupList: public LLFlatListViewEx, public LLOldEvents::LLSimpleListener
{
LOG_CLASS(LLGroupList);
public:
+ struct Params : public LLInitParam::Block
+ {
+ Optional for_agent;
+ Params();
+ };
LLGroupList(const Params& p);
virtual ~LLGroupList();
@@ -55,6 +60,7 @@ public:
void setNameFilter(const std::string& filter);
void toggleIcons();
bool getIconsVisible() const { return mShowIcons; }
+ void setGroups(const std::map< std::string,LLUUID> group_list);
private:
void setDirty(bool val = true) { mDirty = val; }
@@ -70,6 +76,10 @@ private:
bool mShowIcons;
bool mDirty;
std::string mNameFilter;
+
+ bool mForAgent;
+ typedef std::map< std::string,LLUUID> group_map_t;
+ group_map_t mGroups;
};
class LLButton;
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 9adf374c71..50de843f15 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -53,6 +53,7 @@
#include
#include
+#include "llstartup.h"
const S32 LOG_RECALL_SIZE = 2048;
@@ -272,6 +273,10 @@ void LLLogChat::saveHistory(const std::string& filename,
const LLUUID& from_id,
const std::string& line)
{
+ if(LLStartUp::getStartupState() != STATE_LOGIN_CLEANUP)
+ {
+ return;
+ }
std::string tmp_filename = filename;
LLStringUtil::trim(tmp_filename);
if (tmp_filename.empty())
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index b7638059fe..a62c058d1c 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -46,6 +46,8 @@
#include "llvoiceclient.h"
#include "lltextbox.h"
#include "lltrans.h"
+#include "llgroupactions.h"
+#include "llgrouplist.h"
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLDropTarget
@@ -506,6 +508,10 @@ BOOL LLPanelAvatarProfile::postBuild()
enable.add("Profile.EnableBlock", boost::bind(&LLPanelAvatarProfile::enableBlock, this));
enable.add("Profile.EnableUnblock", boost::bind(&LLPanelAvatarProfile::enableUnblock, this));
+ LLGroupList* group_list = getChild("group_list");
+ group_list->setDoubleClickCallback(boost::bind(&LLPanelAvatarProfile::openGroupProfile, this));
+ group_list->setReturnCallback(boost::bind(&LLPanelAvatarProfile::openGroupProfile, this));
+
mProfileMenu = LLUICtrlFactory::getInstance()->createFromFile("menu_profile_overflow.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
LLVoiceClient::getInstance()->addObserver((LLVoiceClientStatusObserver*)this);
@@ -542,7 +548,6 @@ void LLPanelAvatarProfile::resetControls()
getChildView("status_panel")->setVisible( true);
getChildView("profile_buttons_panel")->setVisible( true);
getChildView("title_groups_text")->setVisible( true);
- getChildView("sl_groups")->setVisible( true);
getChildView("add_friend")->setEnabled(true);
getChildView("status_me_panel")->setVisible( false);
@@ -559,7 +564,6 @@ void LLPanelAvatarProfile::resetData()
getChild("status_message")->setValue(LLStringUtil::null);
getChild("sl_description_edit")->setValue(LLStringUtil::null);
getChild("fl_description_edit")->setValue(LLStringUtil::null);
- getChild("sl_groups")->setValue(LLStringUtil::null);
getChild("homepage_edit")->setValue(LLStringUtil::null);
getChild("register_date")->setValue(LLStringUtil::null);
getChild("acc_status_text")->setValue(LLStringUtil::null);
@@ -597,6 +601,12 @@ void LLPanelAvatarProfile::processProfileProperties(const LLAvatarData* avatar_d
void LLPanelAvatarProfile::processGroupProperties(const LLAvatarGroups* avatar_groups)
{
+ //KC: the group_list ctrl can handle all this for us on our own profile
+ if (getAvatarId() == gAgent.getID())
+ return;
+
+ LLGroupList* group_list = getChild("group_list");
+
// *NOTE dzaporozhan
// Group properties may arrive in two callbacks, we need to save them across
// different calls. We can't do that in textbox as textbox may change the text.
@@ -610,22 +620,13 @@ void LLPanelAvatarProfile::processGroupProperties(const LLAvatarGroups* avatar_g
mGroups[group_data.group_name] = group_data.group_id;
}
- // Creating string, containing group list
- std::string groups = "";
- for (group_map_t::iterator it = mGroups.begin(); it != mGroups.end(); ++it)
- {
- if (it != mGroups.begin())
- groups += ", ";
+ group_list->setGroups(mGroups);
+}
- std::string group_name = LLURI::escape(it->first);
- std::string group_url= it->second.notNull()
- ? "[secondlife:///app/group/" + it->second.asString() + "/about " + group_name + "]"
- : getString("no_group_text");
-
- groups += group_url;
- }
-
- getChild("sl_groups")->setValue(groups);
+void LLPanelAvatarProfile::openGroupProfile()
+{
+ LLUUID group_id = getChild("group_list")->getSelectedUUID();
+ LLGroupActions::show(group_id);
}
void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data)
@@ -863,7 +864,6 @@ void LLPanelMyProfile::resetControls()
getChildView("status_panel")->setVisible( false);
getChildView("profile_buttons_panel")->setVisible( false);
getChildView("title_groups_text")->setVisible( false);
- getChildView("sl_groups")->setVisible( false);
getChildView("status_me_panel")->setVisible( true);
getChildView("profile_me_buttons_panel")->setVisible( true);
}
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 11c7716322..4cebf2aafb 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -214,6 +214,8 @@ private:
typedef std::map< std::string,LLUUID> group_map_t;
group_map_t mGroups;
+ void openGroupProfile();
+
LLToggleableMenu* mProfileMenu;
};
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 283348a8f1..8b53b3f13f 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -273,6 +273,8 @@ void LLPreviewTexture::saveAs()
mSaveFileName = file_picker.getFirstFile();
mLoadingFullImage = TRUE;
getWindow()->incBusyCount();
+
+ mImage->forceToSaveRawImage(0) ;//re-fetch the raw image if the old one is removed.
mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave,
0, TRUE, FALSE, new LLUUID( mItemUUID ), &mCallbackTextureList );
}
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 2dd7383b2b..0ffb6094b0 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -265,6 +265,7 @@ void trust_cert_done(const LLSD& notification, const LLSD& response);
void apply_udp_blacklist(const std::string& csv);
bool process_login_success_response();
void transition_back_to_login_panel(const std::string& emsg);
+void cmdline_printchat(std::string message);
void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is_group)
{
@@ -949,7 +950,7 @@ bool idle_startup()
}
// Display the startup progress bar.
- gViewerWindow->setShowProgress(TRUE);
+ gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("PhoenixDisableLoginScreens"));
gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Quit"));
// Poke the VFS, which could potentially block for a while if
@@ -2132,10 +2133,26 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
void set_startup_status(const F32 frac, const std::string& string, const std::string& msg)
{
- gViewerWindow->setProgressPercent(frac*100);
- gViewerWindow->setProgressString(string);
+ if(gSavedSettings.getBOOL("PhoenixDisableLoginScreens"))
+ {
+ static std::string last_d;
+ std::string new_d = string;
+ if(new_d != last_d)
+ {
+ last_d = new_d;
+ cmdline_printchat(new_d);
+ if(new_d == LLTrans::getString("LoginWaitingForRegionHandshake"))
+ {
+ cmdline_printchat(msg);
+ }
+ }
+ }else
+ {
+ gViewerWindow->setProgressPercent(frac*100);
+ gViewerWindow->setProgressString(string);
- gViewerWindow->setProgressMessage(msg);
+ gViewerWindow->setProgressMessage(msg);
+ }
}
bool login_alert_status(const LLSD& notification, const LLSD& response)
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 6515da5958..2908fc1527 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -380,8 +380,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
// Transition to REQUESTED. Viewer has sent some kind
// of TeleportRequest to the source simulator
gTeleportDisplayTimer.reset();
- gViewerWindow->setShowProgress(TRUE);
- gViewerWindow->setProgressPercent(0);
+ if(!gSavedSettings.getBOOL("PhoenixDisableTeleportScreens"))
+ {
+ gViewerWindow->setShowProgress(TRUE);
+ gViewerWindow->setProgressPercent(0);
+ }
gAgent.setTeleportState( LLAgent::TELEPORT_REQUESTED );
gAgent.setTeleportMessage(
LLAgent::sTeleportProgressMessages["requesting"]);
@@ -408,14 +411,17 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
gAgent.setTeleportMessage(
LLAgent::sTeleportProgressMessages["arriving"]);
gTextureList.mForceResetTextureStats = TRUE;
- gAgentCamera.resetView(TRUE, TRUE);
+ if(!gSavedSettings.getBOOL("PhoenixDisableTeleportScreens"))
+ {
+ gAgentCamera.resetView(TRUE, TRUE);
+ }
break;
case LLAgent::TELEPORT_ARRIVING:
// Make the user wait while content "pre-caches"
{
F32 arrival_fraction = (gTeleportArrivalTimer.getElapsedTimeF32() / TELEPORT_ARRIVAL_DELAY);
- if( arrival_fraction > 1.f )
+ if( arrival_fraction > 1.f || gSavedSettings.getBOOL("PhoenixDisableTeleportScreens") )
{
arrival_fraction = 1.f;
//LLFirstUse::useTeleport();
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c41687233f..a8c6dce3b4 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5237,6 +5237,7 @@ BOOL LLVOAvatar::loadAvatar()
}
// Uncomment to enable avatar_lad.xml debugging.
+#if 0
std::ofstream file;
file.open("avatar_lad.log");
for( LLViewerVisualParam* param = (LLViewerVisualParam*) getFirstVisualParam();
@@ -5248,6 +5249,7 @@ BOOL LLVOAvatar::loadAvatar()
}
file.close();
+#endif
return TRUE;
}
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 56b852c1ad..be2bbcb985 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -380,9 +380,7 @@
name="build_btn_panel"
user_resize="false"
width="40">
-
+
-
-
+
+
-
+
+
+
+
+
+
Items:
@@ -118,25 +118,25 @@
show_item_link_overlays="true"
width="290" />
-
-
+
-
-
+
-
-
+
+
+
+
+ width="183">
-
-
+
+
+ width="32">
-
-
+
+
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 2a5330083e..fe1988570c 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -1,7 +1,7 @@
+ fit_panel="true">
+ layout="topleft"
+ follows="left|top|right"
+ height="800"
+ name="second_life_panel"
+ top="0"
+ left="0"
+ width="313">
-
+
-
+
@@ -144,7 +144,7 @@
top_pad="12"
value="Account Status:"
width="280"
- word_wrap="true" />
+ word_wrap="true" />
@@ -189,26 +189,33 @@
link="true"
name="partner_text"
top="0"
- use_ellipses="true"
- width="300" />
+ use_ellipses="true"
+ width="300" />
-
-
+ width="280" />
+
+
+
-
+
@@ -299,7 +309,7 @@
width="280"
word_wrap="false"
use_ellipses="true" />
-
+
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 6ebabb6a4d..1a3eea5d05 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -47,7 +47,7 @@
control_name="AllowMultipleViewers"
follows="top|left"
height="15"
- label="Allow Multiple Viewer"
+ label="Allow Multiple Viewers (May reduce stability and performance)"
layout="topleft"
left="30"
name="allow_multiple_viewer_check"
@@ -57,7 +57,7 @@
control_name="ForceShowGrid"
follows="top|left"
height="15"
- label="Show Grid Selection at login"
+ label="Allow login to other grids (Not all grids will support Firestorm)"
layout="topleft"
left="30"
name="show_grid_selection_check"
@@ -67,7 +67,7 @@
control_name="UseDebugMenus"
follows="top|left"
height="15"
- label="Show Advanced Menu"
+ label="Show Advanced Menu (Use at own risk!)"
layout="topleft"
left="30"
name="show_advanced_menu_check"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 693c33be55..3c72a282a2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -81,7 +81,7 @@
control_name="ShowChatMiniIcons"
height="16"
initial_value="false"
- label="Show avatar icons within chat history"
+ label="Show icons in chat headers"
layout="topleft"
left="30"
name="ShowChatMiniIcons"
@@ -99,7 +99,7 @@
+
+
+
+
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 530f2cd0ed..112bac2637 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -63,7 +63,7 @@
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-
+
+ width="300" />
+
+
@@ -258,7 +268,7 @@
layout="topleft"
left="10"
name="real_world_pic"
- top="00"
+ top="0"
width="275" />
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
Items:
@@ -118,25 +118,25 @@
show_item_link_overlays="true"
width="290" />
-
-
+
-
-
+
-
-
+
+
+
+
+ width="183">
-
-
+
+
+ width="32">
-
-
+
+
diff --git a/indra/newview/skins/metaharper/xui/en/sidepanel_inventory.xml b/indra/newview/skins/metaharper/xui/en/sidepanel_inventory.xml
index f3c6895cee..29d73c0a65 100644
--- a/indra/newview/skins/metaharper/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/metaharper/xui/en/sidepanel_inventory.xml
@@ -102,11 +102,11 @@
user_resize="false"
auto_resize="true"
width="102">
-