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

PE merge from pe-viewer-trunk

master
Tofu Linden 2010-04-07 13:03:35 +01:00
parent 8da371b0f0 7dd71a60c5
commit adce2ecdf8
51 changed files with 709 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llurlentry.cpp
View File

@ -732,7 +732,7 @@ std::string LLUrlEntryWorldMap::getLabel(const std::string &url, const LLUrlLabe
}
const std::string label = LLTrans::getString("SLurlLabelShowOnMap");
std::string location = path_array[2];
std::string location = unescapeUrl(path_array[2]);
std::string x = (path_parts > 3) ? path_array[3] : "128";
std::string y = (path_parts > 4) ? path_array[4] : "128";
std::string z = (path_parts > 5) ? path_array[5] : "0";

1
indra/llui/llurlregistry.cpp
View File

@ -53,6 +53,7 @@ LLUrlRegistry::LLUrlRegistry()
registerUrl(new LLUrlEntryParcel());
registerUrl(new LLUrlEntryTeleport());
registerUrl(new LLUrlEntryWorldMap());
registerUrl(new LLUrlEntryObjectIM());
registerUrl(new LLUrlEntryPlace());
registerUrl(new LLUrlEntryInventory());
registerUrl(new LLUrlEntryObjectIM());

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

@ -8128,13 +8128,13 @@
<key>NearbyPeopleSortOrder</key>
<map>
<key>Comment</key>
<string>Specifies sort order for nearby people (0 = by name, 2 = by most recent)</string>
<string>Specifies sort order for nearby people (0 = by name, 3 = by distance, 4 = by most recent)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>2</integer>
<integer>4</integer>
</map>
<key>RecentPeopleSortOrder</key>
<map>

10
indra/newview/llagent.cpp
View File

@ -1295,6 +1295,11 @@ void LLAgent::stopAutoPilot(BOOL user_cancel)
{
resetAxes(mAutoPilotTargetFacing);
}
// If the user cancelled, don't change the fly state
if (!user_cancel)
{
setFlying(mAutoPilotFlyOnStop);
}
//NB: auto pilot can terminate for a reason other than reaching the destination
if (mAutoPilotFinishedCallback)
{
@ -1302,11 +1307,6 @@ void LLAgent::stopAutoPilot(BOOL user_cancel)
}
mLeaderID = LLUUID::null;
// If the user cancelled, don't change the fly state
if (!user_cancel)
{
setFlying(mAutoPilotFlyOnStop);
}
setControlFlags(AGENT_CONTROL_STOP);
if (user_cancel && !mAutoPilotBehaviorName.empty())

1
indra/newview/llfloatergodtools.cpp
View File

@ -922,6 +922,7 @@ LLPanelObjectTools::~LLPanelObjectTools()
BOOL LLPanelObjectTools::postBuild()
{
refresh();
return TRUE;
}

5
indra/newview/llfloaterland.cpp
View File

@ -91,6 +91,7 @@ static std::string MATURITY = "[MATURITY]";
// constants used in callbacks below - syntactic sugar.
static const BOOL BUY_GROUP_LAND = TRUE;
static const BOOL BUY_PERSONAL_LAND = FALSE;
LLPointer<LLParcelSelection> LLPanelLandGeneral::sSelectionForBuyPass = NULL;
// Statics
LLParcelSelectionObserver* LLFloaterLand::sObserver = NULL;
@ -975,6 +976,8 @@ void LLPanelLandGeneral::onClickBuyPass(void* data)
args["PARCEL_NAME"] = parcel_name;
args["TIME"] = time;
// creating pointer on selection to avoid deselection of parcel until we are done with buying pass (EXT-6464)
sSelectionForBuyPass = LLViewerParcelMgr::getInstance()->getParcelSelection();
LLNotificationsUtil::add("LandBuyPass", args, LLSD(), cbBuyPass);
}
@ -1006,6 +1009,8 @@ bool LLPanelLandGeneral::cbBuyPass(const LLSD& notification, const LLSD& respons
// User clicked OK
LLViewerParcelMgr::getInstance()->buyPass();
}
// we are done with buying pass, additional selection is no longer needed
sSelectionForBuyPass = NULL;
return false;
}

5
indra/newview/llfloaterland.h
View File

@ -234,6 +234,11 @@ protected:
LLSafeHandle<LLParcelSelection>& mParcel;
// This pointer is needed to avoid parcel deselection until buying pass is completed or canceled.
// Deselection happened because of zero references to parcel selection, which took place when
// "Buy Pass" was called from popup menu(EXT-6464)
static LLPointer<LLParcelSelection> sSelectionForBuyPass;
static LLHandle<LLFloater> sBuyPassDialogHandle;
};

4
indra/newview/llfloaterpreference.cpp
View File

@ -107,6 +107,8 @@
#include "llpluginclassmedia.h"
#include "llteleporthistorystorage.h"
#include "lllogininstance.h" // to check if logged in yet
const F32 MAX_USER_FAR_CLIP = 512.f;
const F32 MIN_USER_FAR_CLIP = 64.f;
@ -858,6 +860,8 @@ void LLFloaterPreference::refreshEnabledState()
ctrl_wind_light->setEnabled(ctrl_shader_enable->getEnabled() && shaders);
// now turn off any features that are unavailable
disableUnavailableSettings();
childSetEnabled ("block_list", LLLoginInstance::getInstance()->authSuccess());
}
void LLFloaterPreference::disableUnavailableSettings()

20
indra/newview/llfloatersnapshot.cpp
View File

@ -1319,7 +1319,27 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
// static
void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
{
LLSnapshotLivePreview* previewp = getPreviewView(floater);
if (NULL == previewp)
{
return;
}
// Disable buttons until Snapshot is ready. EXT-6534
BOOL got_snap = previewp->getSnapshotUpToDate();
// process Main buttons
floater->childSetEnabled("share", got_snap);
floater->childSetEnabled("save", got_snap);
floater->childSetEnabled("set_profile_pic", got_snap);
// process Share actions buttons
floater->childSetEnabled("share_to_web", got_snap);
floater->childSetEnabled("share_to_email", got_snap);
// process Save actions buttons
floater->childSetEnabled("save_to_inventory", got_snap);
floater->childSetEnabled("save_to_computer", got_snap);
}
// static

2
indra/newview/llfloaterworldmap.cpp
View File

@ -125,7 +125,7 @@ public:
}
// support the secondlife:///app/worldmap/{LOCATION}/{COORDS} SLapp
const std::string region_name = params[0].asString();
const std::string region_name = LLURI::unescape(params[0].asString());
S32 x = (params.size() > 1) ? params[1].asInteger() : 128;
S32 y = (params.size() > 2) ? params[2].asInteger() : 128;
S32 z = (params.size() > 3) ? params[3].asInteger() : 0;

4
indra/newview/llnotificationtiphandler.cpp
View File

@ -71,8 +71,8 @@ public:
p.notification->getResponseTemplate()));
}
// set line max count to 2 in case of a very long name
snapToMessageHeight(getChild<LLTextBox>("message"), 2);
// set line max count to 3 in case of a very long name
snapToMessageHeight(getChild<LLTextBox>("message"), 3);
}
};

21
indra/newview/llpaneleditwearable.cpp
View File

@ -270,6 +270,8 @@ LLEditWearableDictionary::SubpartEntry::SubpartEntry(ESubpart part,
LLPanelEditWearable::LLPanelEditWearable()
: LLPanel()
, mWearablePtr(NULL)
, mWearableItem(NULL)
{
}
@ -338,8 +340,7 @@ BOOL LLPanelEditWearable::isDirty() const
//virtual
void LLPanelEditWearable::draw()
{
BOOL is_dirty = isDirty();
mBtnRevert->setEnabled(is_dirty);
updateVerbs();
LLPanel::draw();
}
@ -401,6 +402,9 @@ void LLPanelEditWearable::showWearable(LLWearable* wearable, BOOL show)
return;
}
mWearableItem = gInventory.getItem(mWearablePtr->getItemID());
llassert(mWearableItem);
EWearableType type = wearable->getType();
LLPanel *targetPanel = NULL;
std::string title;
@ -489,6 +493,7 @@ void LLPanelEditWearable::initializePanel()
updateScrollingPanelUI();
}
updateVerbs();
}
void LLPanelEditWearable::updateScrollingPanelUI()
@ -645,7 +650,19 @@ void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value
}
}
void LLPanelEditWearable::updateVerbs()
{
bool can_copy = false;
if(mWearableItem)
{
can_copy = mWearableItem->getPermissions().allowCopyBy(gAgentID);
}
BOOL is_dirty = isDirty();
mBtnRevert->setEnabled(is_dirty);
childSetEnabled("save_as_button", is_dirty && can_copy);
}
// EOF

4
indra/newview/llpaneleditwearable.h
View File

@ -41,6 +41,7 @@
class LLWearable;
class LLTextEditor;
class LLTextBox;
class LLViewerInventoryItem;
class LLViewerVisualParam;
class LLVisualParamHint;
class LLViewerJointMesh;
@ -73,9 +74,12 @@ private:
LLPanel* getPanel(EWearableType type);
void getSortedParams(value_map_t &sorted_params, const std::string &edit_group);
void buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, LLAccordionCtrlTab *tab);
// update bottom bar buttons ("Save", "Revert", etc)
void updateVerbs();
// the pointer to the wearable we're editing. NULL means we're not editing a wearable.
LLWearable *mWearablePtr;
LLViewerInventoryItem* mWearableItem;
// these are constant no matter what wearable we're editing
LLButton *mBtnRevert;

2
indra/newview/llpanelgrouplandmoney.cpp
View File

@ -1600,7 +1600,7 @@ void LLPanelGroupLandMoney::setGroupID(const LLUUID& id)
mImplementationp->mMoneySalesTabEHp->setGroupID(mGroupID);
}
mImplementationp->mBeenActivated = true;
mImplementationp->mBeenActivated = false;
activate();
}

75
indra/newview/llpaneloutfitedit.cpp
View File

@ -113,9 +113,9 @@ private:
LLPanelOutfitEdit::LLPanelOutfitEdit()
: LLPanel(), mLookID(), mFetchLook(NULL), mSearchFilter(NULL),
: LLPanel(), mCurrentOutfitID(), mFetchLook(NULL), mSearchFilter(NULL),
mLookContents(NULL), mInventoryItemsPanel(NULL), mAddToLookBtn(NULL),
mRemoveFromLookBtn(NULL), mLookObserver(NULL), mNumItemsInLook(0)
mRemoveFromLookBtn(NULL), mLookObserver(NULL)
{
mSavedFolderState = new LLSaveFolderState();
mSavedFolderState->setApply(FALSE);
@ -157,7 +157,7 @@ BOOL LLPanelOutfitEdit::postBuild()
{
// gInventory.isInventoryUsable() no longer needs to be tested per Richard's fix for race conditions between inventory and panels
mLookName = getChild<LLTextBox>("curr_look_name");
mCurrentOutfitName = getChild<LLTextBox>("curr_outfit_name");
childSetCommitCallback("add_btn", boost::bind(&LLPanelOutfitEdit::showAddWearablesPanel, this), NULL);
@ -206,7 +206,7 @@ BOOL LLPanelOutfitEdit::postBuild()
mLookContents = getChild<LLScrollListCtrl>("look_items_list");
mLookContents->sortByColumn("look_item_sort", TRUE);
mLookContents->setCommitCallback(boost::bind(&LLPanelOutfitEdit::onLookItemSelectionChange, this));
/*
LLButton::Params remove_params;
remove_params.name("remove_from_look");
@ -220,12 +220,12 @@ BOOL LLPanelOutfitEdit::postBuild()
//childSetAction("remove_from_look_btn", boost::bind(&LLPanelOutfitEdit::onRemoveFromLookClicked, this), this);
mRemoveFromLookBtn->setCommitCallback(boost::bind(&LLPanelOutfitEdit::onRemoveFromLookClicked, this));
//getChild<LLPanel>("look_info_group_bar")->addChild(mRemoveFromLookBtn); remove_item_btn
mEditWearableBtn = getChild<LLButton>("edit_wearable_btn");
mEditWearableBtn->setEnabled(FALSE);
mEditWearableBtn->setVisible(FALSE);
mEditWearableBtn->setCommitCallback(boost::bind(&LLPanelOutfitEdit::onEditWearableClicked, this));
childSetAction("remove_item_btn", boost::bind(&LLPanelOutfitEdit::onRemoveFromLookClicked, this), this);
return TRUE;
@ -302,7 +302,7 @@ void LLPanelOutfitEdit::onAddToLookClicked(void)
{
LLFolderViewItem* curr_item = mInventoryItemsPanel->getRootFolder()->getCurSelectedItem();
LLFolderViewEventListener* listenerp = curr_item->getListener();
link_inventory_item(gAgent.getID(), listenerp->getUUID(), mLookID, listenerp->getName(),
link_inventory_item(gAgent.getID(), listenerp->getUUID(), mCurrentOutfitID, listenerp->getName(),
LLAssetType::AT_LINK, LLPointer<LLInventoryCallback>(NULL));
updateLookInfo();
}
@ -367,19 +367,32 @@ void LLPanelOutfitEdit::onUpClicked(void)
void LLPanelOutfitEdit::onEditWearableClicked(void)
{
LLUUID id_to_edit = mLookContents->getSelectionInterface()->getCurrentID();
LLViewerInventoryItem * item_to_edit = gInventory.getItem(id_to_edit);
if (item_to_edit)
{
// returns null if not a wearable (attachment, etc).
LLWearable* wearable_to_edit = gAgentWearables.getWearableFromAssetID(item_to_edit->getAssetUUID());
if (!wearable_to_edit || !wearable_to_edit->getPermissions().allowModifyBy(gAgent.getID()) )
{
LLSidepanelAppearance::editWearable(wearable_to_edit, getParent());
if (mEditWearableBtn->getVisible())
if(wearable_to_edit)
{
bool can_modify = false;
bool is_complete = item_to_edit->isComplete();
// if item_to_edit is a link, its properties are not appropriate,
// lets get original item with actual properties
LLViewerInventoryItem* original_item = gInventory.getItem(wearable_to_edit->getItemID());
if(original_item)
{
mEditWearableBtn->setVisible(FALSE);
can_modify = original_item->getPermissions().allowModifyBy(gAgentID);
is_complete = original_item->isComplete();
}
if (can_modify && is_complete)
{
LLSidepanelAppearance::editWearable(wearable_to_edit, getParent());
if (mEditWearableBtn->getVisible())
{
mEditWearableBtn->setVisible(FALSE);
}
}
}
}
@ -445,7 +458,7 @@ void LLPanelOutfitEdit::lookFetched(void)
// collectDescendentsIf takes non-const reference:
LLFindCOFValidItems is_cof_valid;
gInventory.collectDescendentsIf(mLookID,
gInventory.collectDescendentsIf(mCurrentOutfitID,
cat_array,
item_array,
LLInventoryModel::EXCLUDE_TRASH,
@ -468,12 +481,6 @@ void LLPanelOutfitEdit::lookFetched(void)
mLookContents->addElement(row);
}
if (mLookContents->getItemCount() != mNumItemsInLook)
{
mNumItemsInLook = mLookContents->getItemCount();
LLAppearanceMgr::instance().updateCOF(mLookID);
}
}
void LLPanelOutfitEdit::updateLookInfo()
@ -483,7 +490,7 @@ void LLPanelOutfitEdit::updateLookInfo()
mLookContents->clearRows();
uuid_vec_t folders;
folders.push_back(mLookID);
folders.push_back(mCurrentOutfitID);
mFetchLook->fetch(folders);
if (mFetchLook->isEverythingComplete())
{
@ -496,28 +503,26 @@ void LLPanelOutfitEdit::updateLookInfo()
}
}
void LLPanelOutfitEdit::displayLookInfo(const LLInventoryCategory* pLook)
void LLPanelOutfitEdit::displayCurrentOutfit()
{
if (!pLook)
{
return;
}
if (!getVisible())
{
setVisible(TRUE);
}
if (mLookID != pLook->getUUID())
mCurrentOutfitID = LLAppearanceMgr::getInstance()->getCOF();
std::string current_outfit_name;
if (LLAppearanceMgr::getInstance()->getBaseOutfitName(current_outfit_name))
{
mLookID = pLook->getUUID();
mLookName->setText(pLook->getName());
updateLookInfo();
mCurrentOutfitName->setText(current_outfit_name);
}
else
{
mCurrentOutfitName->setText(getString("No Outfit"));
}
updateLookInfo();
}
void LLPanelOutfitEdit::reset()
{
mLookID.setNull();
}

13
indra/newview/llpaneloutfitedit.h
View File

@ -81,10 +81,6 @@ public:
/*virtual*/ BOOL postBuild();
/*virtual*/ void changed(U32 mask);
void reset();
// Ignore all old information, useful if you are
// recycling an existing dialog and need to clear it.
/*virtual*/ void setParcelID(const LLUUID& parcel_id);
// Sends a request for data about the given parcel, which will
// only update the location if there is none already available.
@ -100,7 +96,7 @@ public:
void onEditWearableClicked(void);
void onUpClicked(void);
void displayLookInfo(const LLInventoryCategory* pLook);
void displayCurrentOutfit();
void lookFetched(void);
@ -108,8 +104,10 @@ public:
private:
LLUUID mLookID;
LLTextBox* mLookName;
//*TODO got rid of mCurrentOutfitID
LLUUID mCurrentOutfitID;
LLTextBox* mCurrentOutfitName;
LLScrollListCtrl* mLookContents;
LLInventoryPanel* mInventoryItemsPanel;
LLFilterEditor* mSearchFilter;
@ -119,7 +117,6 @@ private:
LLButton* mRemoveFromLookBtn;
LLButton* mUpBtn;
LLButton* mEditWearableBtn;
S32 mNumItemsInLook;
LLLookFetchObserver* mFetchLook;
LLInventoryLookObserver* mLookObserver;

21
indra/newview/llpaneloutfitsinventory.cpp
View File

@ -131,7 +131,7 @@ void LLPanelOutfitsInventory::updateVerbs()
if (mListCommands)
{
mListCommands->childSetVisible("look_edit_btn",sShowDebugEditor);
mListCommands->childSetVisible("edit_current_outfit_btn",sShowDebugEditor);
updateListCommands();
}
}
@ -269,19 +269,12 @@ void LLPanelOutfitsInventory::onSelectionChange(const std::deque<LLFolderViewIte
}
}
void LLPanelOutfitsInventory::onSelectorButtonClicked()
void LLPanelOutfitsInventory::showEditOutfitPanel()
{
LLFolderViewItem* cur_item = getRootFolder()->getCurSelectedItem();
LLFolderViewEventListener* listenerp = cur_item->getListener();
if (getIsCorrectType(listenerp))
{
LLSD key;
key["type"] = "look";
key["id"] = listenerp->getUUID();
LLSideTray::getInstance()->showPanel("sidepanel_appearance", key);
}
LLSD key;
key["type"] = "edit_outfit";
LLSideTray::getInstance()->showPanel("sidepanel_appearance", key);
}
LLFolderViewEventListener *LLPanelOutfitsInventory::getCorrectListenerForAction()
@ -328,7 +321,7 @@ void LLPanelOutfitsInventory::initListCommandsHandlers()
mListCommands->childSetAction("make_outfit_btn", boost::bind(&LLPanelOutfitsInventory::onAddButtonClick, this));
mListCommands->childSetAction("wear_btn", boost::bind(&LLPanelOutfitsInventory::onWearButtonClick, this));
mListCommands->childSetAction("look_edit_btn", boost::bind(&LLPanelOutfitsInventory::onSelectorButtonClicked, this));
mListCommands->childSetAction("edit_current_outfit_btn", boost::bind(&LLPanelOutfitsInventory::showEditOutfitPanel, this));
LLDragAndDropButton* trash_btn = mListCommands->getChild<LLDragAndDropButton>("trash_btn");
trash_btn->setDragAndDropHandler(boost::bind(&LLPanelOutfitsInventory::handleDragAndDropToTrash, this

2
indra/newview/llpaneloutfitsinventory.h
View File

@ -64,7 +64,7 @@ public:
bool onSaveCommit(const LLSD& notification, const LLSD& response);
void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
void onSelectorButtonClicked();
void showEditOutfitPanel();
// If a compatible listener type is selected, then return a pointer to that.
// Otherwise, return NULL.

4
indra/newview/llscreenchannel.cpp
View File

@ -480,7 +480,9 @@ void LLScreenChannel::showToastsBottom()
}
toast_rect = (*it).toast->getRect();
toast_rect.setOriginAndSize(getRect().mLeft, bottom + toast_margin, toast_rect.getWidth() ,toast_rect.getHeight());
toast_rect.setOriginAndSize(getRect().mRight - toast_rect.getWidth(),
bottom + toast_margin, toast_rect.getWidth(),
toast_rect.getHeight());
(*it).toast->setRect(toast_rect);
if(floater && floater->overlapsScreenChannel())

6
indra/newview/llsidepanelappearance.cpp
View File

@ -182,11 +182,9 @@ void LLSidepanelAppearance::onOpen(const LLSD& key)
mLookInfoType = key["type"].asString();
if (mLookInfoType == "look")
if (mLookInfoType == "edit_outfit")
{
LLInventoryCategory *pLook = gInventory.getCategory(key["id"].asUUID());
if (pLook)
mOutfitEdit->displayLookInfo(pLook);
mOutfitEdit->displayCurrentOutfit();
}
}

11
indra/newview/llviewermenu.cpp
View File

@ -5331,6 +5331,16 @@ class LLWorldCreateLandmark : public view_listener_t
}
};
class LLWorldPlaceProfile : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
LLSideTray::getInstance()->showPanel("panel_places", LLSD().with("type", "agent"));
return true;
}
};
void handle_look_at_selection(const LLSD& param)
{
const F32 PADDING_FACTOR = 1.75f;
@ -7740,6 +7750,7 @@ void initialize_menus()
commit.add("World.Chat", boost::bind(&handle_chat, (void*)NULL));
view_listener_t::addMenu(new LLWorldAlwaysRun(), "World.AlwaysRun");
view_listener_t::addMenu(new LLWorldCreateLandmark(), "World.CreateLandmark");
view_listener_t::addMenu(new LLWorldPlaceProfile(), "World.PlaceProfile");
view_listener_t::addMenu(new LLWorldSetHomeLocation(), "World.SetHomeLocation");
view_listener_t::addMenu(new LLWorldTeleportHome(), "World.TeleportHome");
view_listener_t::addMenu(new LLWorldSetAway(), "World.SetAway");

3
indra/newview/llvoavatar.cpp
View File

@ -5607,6 +5607,8 @@ void LLVOAvatar::sitDown(BOOL bSitting)
//-----------------------------------------------------------------------------
void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
{
sitDown(TRUE);
if (isSelf())
{
// Might be first sit
@ -5639,7 +5641,6 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
mDrawable->mXform.setRotation(mDrawable->getWorldRotation() * inv_obj_rot);
gPipeline.markMoved(mDrawable, TRUE);
sitDown(TRUE);
mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject
mRoot.setPosition(getPosition());
mRoot.updateWorldMatrixChildren();

8
indra/newview/skins/default/xui/en/floater_god_tools.xml
View File

@ -61,10 +61,10 @@
height="10"
layout="topleft"
left="10"
name="Sim Name:"
name="Region Name:"
top="12"
width="80">
Sim Name:
Region Name:
</text>
<line_editor
border_style="line"
@ -481,10 +481,10 @@
height="10"
layout="topleft"
left="10"
name="Sim Name:"
name="Region Name:"
top="10"
width="80">
Sim Name:
Region Name:
</text>
<text
type="string"

30
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -2540,18 +2540,18 @@ even though the user gets a free copy.
height="19"
initial_value="0"
label="Horizontal (U)"
label_width="90"
label_width="125"
layout="topleft"
left="20"
max_val="100"
name="TexScaleU"
top_pad="6"
width="160" />
width="185" />
<check_box
height="19"
label="Flip"
layout="topleft"
left_pad="10"
left_pad="5"
name="checkbox flip s"
top_delta="0"
width="70" />
@ -2560,17 +2560,17 @@ even though the user gets a free copy.
height="19"
initial_value="0"
label="Vertical (V)"
label_width="90"
label_width="125"
layout="topleft"
left="20"
max_val="100"
name="TexScaleV"
width="160" />
width="185" />
<check_box
height="19"
label="Flip"
layout="topleft"
left_pad="10"
left_pad="5"
name="checkbox flip t"
top_delta="0"
width="70" />
@ -2582,12 +2582,12 @@ even though the user gets a free copy.
initial_value="0"
label="Rotation˚"
layout="topleft"
label_width="100"
label_width="135"
left="10"
max_val="9999"
min_val="-9999"
name="TexRot"
width="170" />
width="195" />
<spinner
decimal_digits="1"
@ -2596,19 +2596,19 @@ even though the user gets a free copy.
initial_value="1"
label="Repeats / Meter"
layout="topleft"
label_width="100"
label_width="135"
left="10"
max_val="10"
min_val="0.1"
name="rptctrl"
width="170" />
width="195" />
<button
follows="left|top"
height="23"
label="Apply"
label_selected="Apply"
layout="topleft"
left_pad="10"
left_pad="5"
name="button apply"
width="75" />
<text
@ -2627,24 +2627,24 @@ even though the user gets a free copy.
height="19"
initial_value="0"
label="Horizontal (U)"
label_width="90"
label_width="125"
layout="topleft"
left="20"
min_val="-1"
name="TexOffsetU"
width="160" />
width="185" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Vertical (V)"
label_width="90"
label_width="125"
layout="topleft"
left_delta="0"
min_val="-1"
name="TexOffsetV"
top_pad="1"
width="160" />
width="185" />
<panel
border="false"
follows="left|top"

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

@ -219,6 +219,13 @@
label="Place Profile"
name="Land"
tear_off="true">
<menu_item_call
label="Place Profile"
layout="topleft"
name="Place Profile">
<menu_item_call.on_click
function="World.PlaceProfile" />
</menu_item_call>
<menu_item_call
label="About Land"
name="About Land">

53
indra/newview/skins/default/xui/en/panel_edit_alpha.xml
View File

@ -1,33 +1,38 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_alpha_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="180"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="400"
left="10"
layout="topleft"
name="avatar_alpha_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="80"
height="100"
label="Lower Alpha"
layout="topleft"
left="10"
left="30"
name="Lower Alpha"
tool_tip="Click to choose a picture"
top="10"
width="64" />
width="94" />
<check_box
control_name="LowerAlphaTextureInvisible"
follows="left"
@ -41,14 +46,14 @@
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="80"
height="100"
label="Upper Alpha"
layout="topleft"
left_pad="10"
left_pad="20"
name="Upper Alpha"
tool_tip="Click to choose a picture"
top="10"
width="64" />
width="94" />
<check_box
control_name="UpperAlphaTextureInvisible"
follows="left"
@ -62,14 +67,14 @@
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="80"
height="100"
label="Head Alpha"
layout="topleft"
left_pad="10"
left="30"
name="Head Alpha"
tool_tip="Click to choose a picture"
top="10"
width="64" />
top="120"
width="94" />
<check_box
control_name="HeadAlphaTextureInvisible"
follows="left"
@ -83,14 +88,14 @@
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="80"
height="100"
label="Eye Alpha"
layout="topleft"
left="10"
left_pad="20"
name="Eye Alpha"
tool_tip="Click to choose a picture"
top="100"
width="64" />
top="120"
width="94" />
<check_box
control_name="Eye AlphaTextureInvisible"
follows="left"
@ -104,14 +109,14 @@
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="80"
height="100"
label="Hair Alpha"
layout="topleft"
left_pad="10"
left="30"
name="Hair Alpha"
tool_tip="Click to choose a picture"
top_delta="-4"
width="64" />
top="230"
width="94" />
<check_box
control_name="HairAlphaTextureInvisible"
follows="left"

55
indra/newview/skins/default/xui/en/panel_edit_eyes.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_eyes_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_eye_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -23,31 +28,49 @@
height="80"
label="Iris"
layout="topleft"
left="8"
left="10"
name="Iris"
tool_tip="Click to choose a picture"
top_pad="10"
top="10"
width="64" />
</panel>
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
name="wearable_accordion"
top_pad="10"
width="303">
<accordion_tab
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="eyes_main_tab"
title="Eyes">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="eyes_main_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

51
indra/newview/skins/default/xui/en/panel_edit_gloves.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_gloves_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_gloves_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -34,31 +39,49 @@
height="80"
label="Color/Tint"
layout="topleft"
left_pad="10"
left_pad="20"
name="Color/Tint"
tool_tip="Click to open color picker"
top="10"
width="64" />
</panel>
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
name="wearable_accordion"
top_pad="10"
width="303">
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="gloves_main_tab"
title="Gloves">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="gloves_main_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

55
indra/newview/skins/default/xui/en/panel_edit_hair.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_hair_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_hair_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -23,26 +28,43 @@
height="80"
label="Texture"
layout="topleft"
left="8"
left="10"
name="Texture"
tool_tip="Click to choose a picture"
top="10"
width="64" />
</panel>
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
name="wearable_accordion"
top_pad="10"
width="303">
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="hair_color_tab"
title="Color">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="hair_color_param_list"
top="0"
@ -50,11 +72,13 @@
</accordion_tab>
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="hair_style_tab"
title="Style">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="hair_style_param_list"
top="0"
@ -62,11 +86,13 @@
</accordion_tab>
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="hair_eyebrows_tab"
title="Eyebrows">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="hair_eyebrows_param_list"
top="0"
@ -74,16 +100,19 @@
</accordion_tab>
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="hair_facial_tab"
title="Facial">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="hair_facial_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

61
indra/newview/skins/default/xui/en/panel_edit_jacket.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_jacket_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_jacket_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -23,11 +28,11 @@
height="80"
label="Upper Fabric"
layout="topleft"
left="10"
left="25"
name="Upper Fabric"
tool_tip="Click to choose a picture"
top="10"
width="64" />
width="74" />
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -35,42 +40,60 @@
height="80"
label="Lower Fabric"
layout="topleft"
left_pad="10"
left_pad="20"
name="Lower Fabric"
tool_tip="Click to choose a picture"
top="10"
width="64" />
width="74" />
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="80"
label="Color/Tint"
layout="topleft"
left_pad="10"
left_pad="20"
name="Color/Tint"
tool_tip="Click to open color picker"
top="10"
width="64" />
width="74" />
</panel>
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
name="wearable_accordion"
top_pad="10"
width="303">
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="jacket_main_tab"
title="Jacket">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="jacket_main_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

51
indra/newview/skins/default/xui/en/panel_edit_pants.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_pants_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_pants_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -34,31 +39,49 @@
height="80"
label="Color/Tint"
layout="topleft"
left_pad="10"
left_pad="20"
name="Color/Tint"
tool_tip="Click to open color picker"
top="10"
width="64" />
</panel>
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
name="wearable_accordion"
top_pad="10"
width="303">
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="pants_main_tab"
title="Pants">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="pants_main_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

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

@ -4,7 +4,7 @@
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_shape_panel"
top_pad="10"
width="333" >
@ -14,7 +14,7 @@
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left"
follows="top|left|right"
height="50"
left="10"
layout="topleft"

47
indra/newview/skins/default/xui/en/panel_edit_shirt.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_shirt_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_shirt_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -34,31 +39,49 @@
height="80"
label="Color/Tint"
layout="topleft"
left_pad="10"
left_pad="20"
name="Color/Tint"
tool_tip="Click to open color picker"
top="10"
width="64" />
</panel>
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
top_pad="10"
width="303">
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="shirt_main_tab"
title="Shirt">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="shirt_main_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

51
indra/newview/skins/default/xui/en/panel_edit_shoes.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_shoes_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_shoes_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -34,31 +39,49 @@
height="80"
label="Color/Tint"
layout="topleft"
left_pad="10"
left_pad="20"
name="Color/Tint"
tool_tip="Click to open color picker"
top="10"
width="64" />
</panel>
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
name="wearable_accordion"
top_pad="10"
width="303">
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="shoes_main_tab"
title="Shoes">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="shoes_main_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

57
indra/newview/skins/default/xui/en/panel_edit_skin.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_skin_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_skin_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
allow_no_texture="true"
can_apply_immediately="true"
@ -24,7 +29,7 @@
height="80"
label="Head Tattoos"
layout="topleft"
left="10"
left="25"
name="Head Tattoos"
tool_tip="Click to choose a picture"
top="10"
@ -37,7 +42,7 @@
height="80"
label="Upper Tattoos"
layout="topleft"
left_pad="10"
left_pad="20"
name="Upper Tattoos"
tool_tip="Click to choose a picture"
top="10"
@ -50,26 +55,43 @@
height="80"
label="Lower Tattoos"
layout="topleft"
left_pad="10"
left_pad="20"
name="Lower Tattoos"
tool_tip="Click to choose a picture"
top="10"
width="74" />
</panel>
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
layout="topleft"
follows="all"
height ="300"
left="0"
name="wearable_accordion"
top_pad="10"
width="303">
top="0"
single_expansion="true"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="skin_color_tab"
title="Skin Color">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="skin_color_param_list"
top="0"
@ -77,11 +99,13 @@
</accordion_tab>
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="skin_face_tab"
title="Face Detail">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="skin_face_param_list"
top="0"
@ -89,11 +113,13 @@
</accordion_tab>
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="skin_makeup_tab"
title="Makeup">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="skin_makeup_param_list"
top="0"
@ -101,16 +127,19 @@
</accordion_tab>
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="skin_body_tab"
title="Body Detail">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="skin_body_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

51
indra/newview/skins/default/xui/en/panel_edit_skirt.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_skirt_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_skirt_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -34,31 +39,49 @@
height="80"
label="Color/Tint"
layout="topleft"
left_pad="10"
left_pad="20"
name="Color/Tint"
tool_tip="Click to open color picker"
top="10"
width="64" />
</panel>
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
name="wearable_accordion"
top_pad="10"
width="303">
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="skirt_main_tab"
title="Skirt">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="skirt_main_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

51
indra/newview/skins/default/xui/en/panel_edit_socks.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_socks_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_socks_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -34,31 +39,49 @@
height="80"
label="Color/Tint"
layout="topleft"
left_pad="10"
left_pad="20"
name="Color/Tint"
tool_tip="Click to open color picker"
top="10"
width="64" />
</panel>
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
name="wearable_accordion"
top_pad="10"
width="303">
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="socks_main_tab"
title="Socks">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="socks_main_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

37
indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
View File

@ -1,57 +1,62 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_tattoo_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="400"
left="10"
layout="topleft"
name="avatar_tattoo_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="80"
height="100"
label="Head Tattoo"
layout="topleft"
left="10"
left="30"
name="Head Tattoo"
tool_tip="Click to choose a picture"
top="10"
width="64" />
width="94" />
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="80"
height="100"
label="Upper Tattoo"
layout="topleft"
left_pad="10"
left_pad="30"
name="Upper Tattoo"
tool_tip="Click to choose a picture"
top="10"
width="64" />
width="94" />
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
height="80"
height="100"
label="Lower Tattoo"
layout="topleft"
left_pad="10"
left="30"
name="Lower Tattoo"
tool_tip="Click to choose a picture"
top="10"
width="64" />
top_pad="10"
width="94" />
</panel>
</panel>

51
indra/newview/skins/default/xui/en/panel_edit_underpants.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_underpants_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_underpants_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -34,31 +39,49 @@
height="80"
label="Color/Tint"
layout="topleft"
left_pad="10"
left_pad="20"
name="Color/Tint"
tool_tip="Click to open color picker"
top="10"
width="64" />
</panel>
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
name="wearable_accordion"
top_pad="10"
width="303">
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="underpants_main_tab"
title="Underpants">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="underpants_main_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

51
indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
View File

@ -1,21 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="400"
layout="topleft"
left="10"
left="0"
name="edit_undershirt_panel"
top_pad="10"
width="313" >
width="333" >
<panel
border="true"
follows="left|top|right"
height="100"
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left|right"
height="90"
left="10"
layout="topleft"
name="avatar_undershirt_color_panel"
top="0"
width="293" >
width="313" >
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@ -34,31 +39,49 @@
height="80"
label="Color/Tint"
layout="topleft"
left_pad="10"
left_pad="20"
name="Color/Tint"
tool_tip="Click to open Color Picker"
top="10"
width="64" />
</panel>
<accordion
follows="left|top|right|bottom"
height ="340"
left="10"
name="wearable_accordion"
top_pad="10"
width="303">
<panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
height="300"
layout="topleft"
left="10"
name="accordion_panel"
top_pad="10"
width="313">
<accordion
follows="all"
height ="300"
layout="topleft"
left="0"
name="wearable_accordion"
single_expansion="true"
top="0"
width="313">
<accordion_tab
layout="topleft"
fit_panel="false"
min_height="150"
name="undershirt_main_tab"
title="Undershirt">
<scrolling_panel_list
follows="all"
layout="topleft"
left="0"
name="undershirt_main_param_list"
top="0"
width="303" />
</accordion_tab>
</accordion>
</panel>
</panel>

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

@ -155,7 +155,7 @@ left="0"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="top|left"
follows="top|left|right"
height="60"
label="Shirt"
layout="topleft"
@ -164,7 +164,7 @@ left="0"
top_pad="10"
width="313">
<text
follows="top|left"
follows="top|left|right"
height="16"
layout="topleft"
left="10"

8
indra/newview/skins/default/xui/en/panel_online_status_toast.xml
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="false"
height="152"
height="40"
label="friend_online_status"
layout="topleft"
left="0"
name="friend_online_status"
top="0"
width="305">
width="220">
<avatar_icon
follows="top|left"
height="18"
@ -21,7 +21,7 @@
<text
font="SansSerifSmall"
follows="all"
height="137"
height="13"
layout="topleft"
left_pad="5"
name="message"
@ -29,7 +29,7 @@
top="15"
use_ellipses="true"
value=""
width="285"
width="189"
word_wrap="true"
max_length="350" />
</panel>

5
indra/newview/skins/default/xui/en/panel_outfit_edit.xml
View File

@ -12,6 +12,9 @@
name="outfit_edit"
top="0"
width="320">
<string
name="No Outfit"
value="No Outfit"/>
<panel.string
name="not_available">
@ -94,7 +97,7 @@
font="SansSerifHugeBold"
height="26"
layout="topleft"
name="curr_look_name"
name="curr_outfit_name"
text_color="LtGray"
top_pad="0"
value="[Current Outfit]"

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

@ -122,7 +122,7 @@
label="Edit Outfit"
layout="topleft"
right="-140"
name="look_edit_btn"
name="edit_current_outfit_btn"
top="26"
visible="false"
width="50" />

8
indra/newview/skins/default/xui/en/panel_status_bar.xml
View File

@ -62,11 +62,11 @@
halign="right"
font="SansSerifSmall"
follows="right|top"
image_selected="BuyArrow_Over"
image_unselected="BuyArrow_Over"
image_pressed="BuyArrow_Press"
image_selected="spacer35.tga"
image_unselected="spacer35.tga"
image_pressed="spacer35.tga"
height="16"
label="Buy"
label="Buy L$"
label_color="EmphasisColor"
left_pad="0"
label_shadow="false"

4
indra/newview/skins/default/xui/es/floater_preferences.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater min_width="350" name="Preferences" title="PREFERENCIAS" width="646">
<floater name="Preferences" title="PREFERENCIAS">
<button label="OK" label_selected="OK" name="OK"/>
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<tab_container name="pref core" tab_width="146" width="646">
<tab_container name="pref core">
<panel label="General" name="general"/>
<panel label="Gráficos" name="display"/>
<panel label="Privacidad" name="im"/>

4
indra/newview/skins/default/xui/fr/floater_preferences.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater min_width="330" name="Preferences" title="PRÉFÉRENCES" width="626">
<floater name="Preferences" title="PRÉFÉRENCES">
<button label="OK" label_selected="OK" name="OK"/>
<button label="Annuler" label_selected="Annuler" name="Cancel"/>
<tab_container name="pref core" tab_width="126" width="626">
<tab_container name="pref core">
<panel label="Général" name="general"/>
<panel label="Graphiques" name="display"/>
<panel label="Confidentialité" name="im"/>

6
indra/newview/skins/default/xui/fr/floater_tools.xml
View File

@ -441,9 +441,9 @@
<check_box label="Inverser" name="checkbox flip s"/>
<spinner label="Vertical (V)" name="TexScaleV"/>
<check_box label="Inverser" name="checkbox flip t"/>
<spinner label="Rotation˚" left="122" name="TexRot" width="58"/>
<spinner label="Répétitions / Mètre" left="122" name="rptctrl" width="58"/>
<button label="Appliquer" label_selected="Appliquer" left_delta="68" name="button apply" width="75"/>
<spinner label="Rotation˚" name="TexRot" />
<spinner label="Répétitions / Mètre" name="rptctrl"/>
<button label="Appliquer" label_selected="Appliquer" name="button apply"/>
<text name="tex offset">
Décalage de la texture
</text>

4
indra/newview/skins/default/xui/it/floater_preferences.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater min_width="350" name="Preferences" title="PREFERENZE" width="646">
<floater name="Preferences" title="PREFERENZE">
<button label="OK" label_selected="OK" name="OK"/>
<button label="Annulla" label_selected="Annulla" name="Cancel"/>
<tab_container name="pref core" tab_width="146" width="646">
<tab_container name="pref core" tab_width="100">
<panel label="Generale" name="general"/>
<panel label="Grafica" name="display"/>
<panel label="Riservatezza" name="im"/>

6
indra/newview/skins/default/xui/it/floater_tools.xml
View File

@ -443,9 +443,9 @@ della texture
<check_box label="Inverti" name="checkbox flip s"/>
<spinner label="Verticale (V)" name="TexScaleV"/>
<check_box label="Inverti" name="checkbox flip t"/>
<spinner label="Rotazione˚" left="120" name="TexRot" width="60"/>
<spinner label="Ripetizioni / Metro" left="120" name="rptctrl" width="60"/>
<button label="Applica" label_selected="Applica" left_delta="72" name="button apply"/>
<spinner label="Rotazione˚" name="TexRot" />
<spinner label="Ripetizioni / Metro" name="rptctrl" />
<button label="Applica" label_selected="Applica" name="button apply"/>
<text name="tex offset">
Bilanciamento della texture
</text>

4
indra/newview/skins/default/xui/pt/floater_preferences.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater min_width="332" name="Preferences" title="PREFERÊNCIAS" width="628">
<floater name="Preferences" title="PREFERÊNCIAS">
<button label="OK" label_selected="OK" name="OK"/>
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<tab_container name="pref core" tab_width="128" width="628">
<tab_container name="pref core">
<panel label="Geral" name="general"/>
<panel label="Vídeo" name="display"/>
<panel label="Privacidade" name="im"/>