Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source 
Conflicts:
	indra/newview/skins/default/xui/en-us/panel_friends.xml
This commit is contained in:
CharleyLevenque
2010-09-08 20:14:14 -04:00
parent 52612780a6 fb1194ec7c
commit 3fbb058867
20 changed files with 235 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llversionviewer.h
View File

@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 4;
const S32 LL_VERSION_PATCH = 2;
const S32 LL_VERSION_BUILD = 1;
const S32 LL_VERSION_BUILD = 2;
const char * const LL_CHANNEL = "Ascent Viewer Release";

56
indra/newview/app_settings/client_definitions.xml
View File

@@ -98,6 +98,20 @@
<key>name</key>
<string>Day Oh proxy</string>
</map>
<key>28b4da3f-5f9b-f44e-1387-6a115ab482c5</key>
<map>
<key>color</key>
<array>
<real>0.64314000000000004</real>
<real>0.89803999999999995</real>
<real>0.99607999999999997</real>
<real>1</real>
</array>
<key>multiple</key>
<real>1</real>
<key>name</key>
<string>Diamond</string>
</map>
<key>072343d0-1ce9-0952-4106-5312af4a789a</key>
<map>
<key>color</key>
@@ -406,20 +420,6 @@
<key>name</key>
<string>NeilLife</string>
</map>
<key>e6f9c019-8783-dc3e-b265-41f1510333fc</key>
<map>
<key>color</key>
<array>
<real>2</real>
<real>2</real>
<real>0</real>
<real>1</real>
</array>
<key>multiple</key>
<real>0</real>
<key>name</key>
<string>NeilLife</string>
</map>
<key>f5a48821-9a98-d09e-8d6a-50cc08ba9a47</key>
<map>
<key>color</key>
@@ -448,6 +448,34 @@
<key>name</key>
<string>NeilLife</string>
</map>
<key>e6f9c019-8783-dc3e-b265-41f1510333fc</key>
<map>
<key>color</key>
<array>
<real>2</real>
<real>2</real>
<real>0</real>
<real>1</real>
</array>
<key>multiple</key>
<real>0</real>
<key>name</key>
<string>Onyx</string>
</map>
<key>ed63fbd0-589e-fe1d-a3d0-16905efaa96b</key>
<map>
<key>color</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>multiple</key>
<real>2</real>
<key>name</key>
<string>Phoenix</string>
</map>
<key>f3fd74a6-fee7-4b2f-93ae-ddcb5991da04</key>
<map>
<key>color</key>

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

@@ -2,6 +2,17 @@
<llsd>
<map>
<!--Expanded settings from Vanilla SL -->
<key>AscentShowLookAt</key>
<map>
<key>Comment</key>
<string>Avatar position modifier (X)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<real>0</real>
</map>
<key>AscentAvatarXModifier</key>
<map>
<key>Comment</key>
@@ -35,17 +46,17 @@
<key>Value</key>
<real>0.0</real>
</map>
<key>AscentShowFriendsTag</key>
<map>
<key>Comment</key>
<string>Show friends client tags as (Friend), and colorize them specially.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentShowFriendsTag</key>
<map>
<key>Comment</key>
<string>Show friends client tags as (Friend), and colorize them specially.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentBuildAlwaysEnabled</key>
<map>
<key>Comment</key>
@@ -379,11 +390,11 @@
<key>InventorySortOrder</key>
<map>
<key>Comment</key>
<string>Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
<string>Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
<key>Type</key>
<string>U32</string>
<string>U32</string>
<key>Value</key>
<integer>3</integer>
<integer>3</integer>
</map>
<key>AO.Enabled</key>
<map>
@@ -647,6 +658,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentUploadFolder</key>
<map>
<key>Comment</key>
<string>Active folder for the Uploader</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>None</string>
</map>
<key>AscentUseCustomTag</key>
<map>
<key>Comment</key>
@@ -13073,7 +13095,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Second Life Release</string>
<string>Ascent Viewer Release</string>
</map>
<key>VertexShaderEnable</key>
<map>

4
indra/newview/ascentprefssys.cpp
View File

@@ -137,7 +137,9 @@ void LLPrefsAscentSysImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
}
else if (ctrl->getName() == "show_look_at_check")
{
LLHUDEffectLookAt::sDebugLookAt = self->childGetValue("show_look_at_check").asBoolean();
BOOL lookAt = self->childGetValue("show_look_at_check").asBoolean();
LLHUDEffectLookAt::sDebugLookAt = lookAt;
gSavedSettings.setBOOL("AscentShowLookAt", lookAt);
}
}

65
indra/newview/ascentuploadbrowser.cpp
View File

@@ -43,32 +43,41 @@ ASFloaterUploadBrowser::ASFloaterUploadBrowser()
: LLFloater(std::string("floater_upload_browser"), std::string("FloaterUploadRect"), LLStringUtil::null)
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_upload_browser.xml");
mPathName = gDirUtilp->getSkinBaseDir();
mPathName = gSavedSettings.getString("AscentUploadFolder");
if (mPathName == "None")
mPathName = gDirUtilp->getExecutableDir();
mFilterType = "None";
mFileList = getChild<LLScrollListCtrl>("file_list");
mDriveCombo = getChild<LLComboBox>("drive_combo");
mBookmarkCombo = getChild<LLComboBox>("bookmark_combo");
//File list ------------------------------------------------------
mFileList = getChild<LLScrollListCtrl>("file_list");
childSetCommitCallback("file_list", onClickFile, this);
childSetDoubleClickCallback("file_list", onDoubleClick);
childSetCommitCallback("file_filter_combo", onUpdateFilter, this);
//Above File List ------------------------------------------------
mBookmarkCombo = getChild<LLComboBox>("bookmark_combo");
mDriveCombo = getChild<LLComboBox>("drive_combo");
childSetCommitCallback("drive_combo", onChangeDrives, this);
//This is so unbelievably shitty I can't believe it -HgB
std::string drive_letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
std::string drive_letters[] = {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"}; //Oh my god it's somehow worse now -HgB
S32 index;
mDriveCombo->removeall();
for (index = 0; index < 26; index++)
{
std::string dir = drive_letters.substr(index, index) + ":" + gDirUtilp->getDirDelimiter();
S32 file_count = gDirUtilp->countFilesInDir(dir, "*.*");
llinfos << dir << " - " << file_count << llendl;
std::string dir = drive_letters[index] + ":";
S32 file_count = gDirUtilp->countFilesInDir(dir + gDirUtilp->getDirDelimiter(), "*.*");
if(file_count)
{
mDriveCombo->add(dir, ADD_BOTTOM);
}
}
childSetAction("directory_button", onClickFilepathGoto, this);
//Below File List ------------------------------------------------
childSetCommitCallback("file_filter_combo", onUpdateFilter, this);
refresh();
mFileList->sortByColumn(std::string("file_name"), TRUE);
mFileList->sortByColumn(std::string("file_type"), TRUE);
@@ -82,12 +91,38 @@ ASFloaterUploadBrowser::~ASFloaterUploadBrowser()
sInstance = NULL;
}
//static
void ASFloaterUploadBrowser::onClickFilepathGoto(void* data)
{
ASFloaterUploadBrowser* panelp = (ASFloaterUploadBrowser*)data;
std::string new_path = panelp->childGetValue("dir_path");
if (new_path != panelp->mPathName)
{
panelp->mPathName = new_path;
panelp->refresh();
panelp->mFileList->selectFirstItem();
panelp->childSetValue("asset_name", "");
}
}
void ASFloaterUploadBrowser::onClickFile(LLUICtrl* ctrl, void* user_data)
{
ASFloaterUploadBrowser* panelp = (ASFloaterUploadBrowser*)user_data;
panelp->refreshUploadOptions();
}
void ASFloaterUploadBrowser::onChangeDrives(LLUICtrl* ctrl, void* user_data)
{
ASFloaterUploadBrowser* panelp = (ASFloaterUploadBrowser*)user_data;
if (panelp->mDriveCombo->getSelectedValue().asString() != panelp->mFilterType)
{
panelp->mPathName = panelp->mDriveCombo->getSelectedValue().asString();
panelp->refresh();
panelp->mFileList->selectFirstItem();
panelp->childSetValue("asset_name", "");
}
}
void ASFloaterUploadBrowser::onUpdateFilter(LLUICtrl* ctrl, void* user_data)
{
ASFloaterUploadBrowser* panelp = (ASFloaterUploadBrowser*)user_data;
@@ -150,6 +185,11 @@ void ASFloaterUploadBrowser::handleDoubleClick()
}
else if (mFileList->getFirstSelected()->getColumn(LIST_FILE_TYPE)->getValue().asInteger() == LIST_TYPE_FOLDER)
{
//Make sure that it's an actual folder so you don't get stuck - Specifically meant for files with no extension. -HgB
std::string new_path = mPathName + gDirUtilp->getDirDelimiter() + mFileList->getFirstSelected()->getColumn(LIST_FILE_NAME)->getValue().asString();
S32 file_count = gDirUtilp->countFilesInDir(new_path, "*.*");
if(!file_count)
return;
mPathName = mPathName + gDirUtilp->getDirDelimiter() + mFileList->getFirstSelected()->getColumn(LIST_FILE_NAME)->getValue().asString();
refresh();
mFileList->selectFirstItem();
@@ -164,7 +204,8 @@ void ASFloaterUploadBrowser::refresh()
std::string fullPath = mPathName + gDirUtilp->getDirDelimiter();
mFileList->deselectAllItems();
mFileList->deleteAllItems();
llinfos << "Getting file listing at " << gDirUtilp->getDirName(fullPath) << " side note " << gDirUtilp->getDirName("C:\\") << llendl;
childSetValue("dir_path", gDirUtilp->getDirName(fullPath));
gSavedSettings.setString("AscentUploadFolder", mPathName);
gDirUtilp->getNextFileInDir(gDirUtilp->getChatLogsDir(),"*", filename, false); //Clears the last file
bool found = true;
S32 file_count = 0;

4
indra/newview/ascentuploadbrowser.h
View File

@@ -24,10 +24,14 @@ class ASFloaterUploadBrowser : public LLFloater
public:
ASFloaterUploadBrowser();
virtual ~ASFloaterUploadBrowser();
//File list
static void onClickFile(LLUICtrl* ctrl, void* user_data);
static void onUpdateFilter(LLUICtrl* ctrl, void* user_data);
static void onDoubleClick(void* user_data);
static void onChangeDrives(LLUICtrl* ctrl, void* user_data);
static void onClickFilepathGoto(void* data);
void refresh();
void refreshUploadOptions();
void handleDoubleClick();

4
indra/newview/llappviewer.cpp
View File

@@ -74,7 +74,7 @@
#include "llweb.h"
#include "llsecondlifeurls.h"
#include <boost/bind.hpp>
#if LL_WINDOWS
@@ -133,6 +133,7 @@
#include "llworld.h"
#include "llhudeffecttrail.h"
#include "llhudeffectlookat.h"
#include "llvectorperfoptions.h"
#include "llurlsimstring.h"
#include "llwatchdog.h"
@@ -666,6 +667,7 @@ bool LLAppViewer::init()
gSavedSettings.setS32("NumSessions", mNumSessions);
gSavedSettings.setString("HelpLastVisitedURL",gSavedSettings.getString("HelpHomeURL"));
LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("AscentShowLookAt");
if (gSavedSettings.getBOOL("VerboseLogs"))
{

4
indra/newview/llfolderview.cpp
View File

@@ -349,7 +349,7 @@ void LLFolderViewItem::refresh()
LLStringUtil::toUpper(searchable_label_desc);
LLStringUtil::toUpper(searchable_label_all);
if (mSearchableLabel.compare(searchable_label) ||
if (mSearchableLabel.compare(searchable_label) ||
mSearchableLabelCreator.compare(searchable_label_creator) ||
mSearchableLabelDesc.compare(searchable_label_desc) ||
mSearchableLabelAll.compare(searchable_label_all))
@@ -4746,7 +4746,7 @@ std::string::size_type LLInventoryFilter::getStringMatchOffset() const
BOOL LLInventoryFilter::isNotDefault()
{
return mFilterOps.mFilterTypes != mDefaultFilterOps.mFilterTypes
|| mFilterSubString.size()
|| mFilterSubString.size()
|| mFilterWorn
|| mFilterOps.mPermissions != mDefaultFilterOps.mPermissions
|| mFilterOps.mMinDate != mDefaultFilterOps.mMinDate

2
indra/newview/llhudeffectlookat.cpp
View File

@@ -55,7 +55,7 @@
// </edit>
BOOL LLHUDEffectLookAt::sDebugLookAt = TRUE;
BOOL LLHUDEffectLookAt::sDebugLookAt = FALSE;
// packet layout
const S32 SOURCE_AVATAR = 0;

16
indra/newview/llinventoryactions.cpp
View File

@@ -472,14 +472,6 @@ class LLDoCreate : public inventory_panel_listener_t
LLInventoryModel* model = mPtr->getModel();
if(!model) return false;
std::string type = userdata.asString();
// <edit>
if(type == "pretend")
{
LLFloaterNewLocalInventory* floater = new LLFloaterNewLocalInventory();
floater->center();
}
else
// </edit>
do_create(model, mPtr, type, LLFolderBridge::sSelf);
return true;
}
@@ -492,6 +484,14 @@ class LLDoCreateFloater : public inventory_listener_t
LLInventoryModel* model = mPtr->getPanel()->getModel();
if(!model) return false;
std::string type = userdata.asString();
// <edit>
if(type == "pretend")
{
LLFloaterNewLocalInventory* floater = new LLFloaterNewLocalInventory();
floater->center();
}
else
// </edit>
do_create(model, mPtr->getPanel(), type);
return true;
}

3
indra/newview/lllocalinventory.cpp
View File

@@ -53,7 +53,7 @@ LLUUID LLLocalInventory::addItem(std::string name, int type, LLUUID asset_id)
"",
LLSaleInfo::DEFAULT,
0,
0);
time_corrected());
addItem(item);
return item_id;
}
@@ -63,6 +63,7 @@ void LLLocalInventory::addItem(LLViewerInventoryItem* item)
//gInventory.addPretendItem(item);
LLInventoryModel::update_map_t update;
++update[item->getParentUUID()];
item->updateServer(TRUE);
gInventory.accountForUpdate(update);
gInventory.updateItem(item);
gInventory.notifyObservers();

3
indra/newview/lltoolbar.cpp
View File

@@ -132,6 +132,9 @@ BOOL LLToolBar::postBuild()
childSetAction("radar_list_btn", onClickRadarList, this);
childSetControlName("radar_list_btn", "RadarListBtnState");
childSetAction("fly_btn", onClickFly, this);
childSetControlName("fly_btn", "FlyBtnState");
childSetAction("sit_btn", onClickSit, this);
childSetControlName("sit_btn", "SitBtnState");

17
indra/newview/llviewermenufile.cpp
View File

@@ -1256,12 +1256,15 @@ void temp_upload_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
item_id.generate();
LLPermissions* perms = new LLPermissions();
perms->set(LLPermissions::DEFAULT);
perms->setOwnerAndGroup(LLUUID::null, LLUUID::null, LLUUID::null, false);
perms->setMaskBase(0);
perms->setMaskEveryone(0);
perms->setMaskGroup(0);
perms->setMaskNext(0);
perms->setMaskOwner(0);
perms->setOwnerAndGroup(gAgentID, gAgentID, gAgentID, false);
perms->setMaskBase(PERM_ALL);
perms->setMaskOwner(PERM_ALL);
perms->setMaskEveryone(PERM_ALL);
perms->setMaskGroup(PERM_ALL);
perms->setMaskNext(PERM_ALL);
LLViewerInventoryItem* item = new LLViewerInventoryItem(
item_id,
gLocalInventoryRoot,
@@ -1273,7 +1276,7 @@ void temp_upload_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
data->mAssetInfo.getDescription(),
LLSaleInfo::DEFAULT,
0,
0);
time_corrected());
LLLocalInventory::addItem(item);
}
else

1
indra/newview/skins/default/textures/textures.xml
View File

@@ -111,6 +111,7 @@
<texture name="inv_folder_notecard.tga"/>
<texture name="inv_folder_object.tga"/>
<texture name="inv_folder_plain_closed.tga"/>
<texture name="inv_folder_plain_open.tga"/>
<texture name="inv_folder_script.tga"/>
<texture name="inv_folder_snapshot.tga"/>
<texture name="inv_folder_sound.tga"/>

68
indra/newview/skins/default/xui/en-us/floater_inventory.xml
View File

@@ -4,40 +4,40 @@
mouse_opaque="true" name="Inventory" rect_control="FloaterInventoryRect"
title="Inventory" width="467">
<search_editor bottom="-50" follows="left|top|right" height="16" label="Type here to search"
left="6" mouse_opaque="true" name="inventory search editor" width="455" />
<text name="group_titles_textbox" font="SansSerifSmall" follows="left|top"
height="16" left="10" bottom_delta="-24" width="120">Quick Filter:</text>
<!-- Inventory Type Filter Labels -->
<string name="filter_type_all">All Types</string>
<string name="filter_type_animation">Animations</string>
<string name="filter_type_callingcard">Calling Cards</string>
<string name="filter_type_wearable">Clothing / Body Parts</string>
<string name="filter_type_gesture">Gestures</string>
<string name="filter_type_landmark">Landmarks</string>
<string name="filter_type_notecard">Notecards</string>
<string name="filter_type_object">Objects</string>
<string name="filter_type_script">Scripts</string>
<string name="filter_type_sound">Sounds</string>
<string name="filter_type_texture">Textures</string>
<string name="filter_type_snapshot">Snapshots</string>
<string name="filter_type_custom">Custom...</string>
<combo_box name="Quick Filter" label="Quick Filter" follows="left|top" height="20" left="80" width="150" bottom_delta="0">
<combo_item name="filter_type_all">All Types</combo_item>
<separator />
<combo_item name="filter_type_animation">Animations</combo_item>
<combo_item name="filter_type_callingcard">Calling Cards</combo_item>
<combo_item name="filter_type_wearable">Clothing / Body Parts</combo_item>
<combo_item name="filter_type_gesture">Gestures</combo_item>
<combo_item name="filter_type_landmark">Landmarks</combo_item>
<combo_item name="filter_type_notecard">Notecards</combo_item>
<combo_item name="filter_type_object">Objects</combo_item>
<combo_item name="filter_type_script">Scripts</combo_item>
<combo_item name="filter_type_sound">Sounds</combo_item>
<combo_item name="filter_type_texture">Textures</combo_item>
<combo_item name="filter_type_snapshot">Snapshots</combo_item>
<separator />
<combo_item name="filter_type_custom">Custom...</combo_item>
</combo_box>
left="6" mouse_opaque="true" name="inventory search editor" width="455" />
<text name="group_titles_textbox" font="SansSerifSmall" follows="left|top"
height="16" left="10" bottom_delta="-24" width="120">Quick Filter:</text>
<!-- Inventory Type Filter Labels -->
<string name="filter_type_all">All Types</string>
<string name="filter_type_animation">Animations</string>
<string name="filter_type_callingcard">Calling Cards</string>
<string name="filter_type_wearable">Clothing / Body Parts</string>
<string name="filter_type_gesture">Gestures</string>
<string name="filter_type_landmark">Landmarks</string>
<string name="filter_type_notecard">Notecards</string>
<string name="filter_type_object">Objects</string>
<string name="filter_type_script">Scripts</string>
<string name="filter_type_sound">Sounds</string>
<string name="filter_type_texture">Textures</string>
<string name="filter_type_snapshot">Snapshots</string>
<string name="filter_type_custom">Custom...</string>
<combo_box name="Quick Filter" label="Quick Filter" follows="left|top" height="20" left="80" width="150" bottom_delta="0">
<combo_item name="filter_type_all">All Types</combo_item>
<separator />
<combo_item name="filter_type_animation">Animations</combo_item>
<combo_item name="filter_type_callingcard">Calling Cards</combo_item>
<combo_item name="filter_type_wearable">Clothing / Body Parts</combo_item>
<combo_item name="filter_type_gesture">Gestures</combo_item>
<combo_item name="filter_type_landmark">Landmarks</combo_item>
<combo_item name="filter_type_notecard">Notecards</combo_item>
<combo_item name="filter_type_object">Objects</combo_item>
<combo_item name="filter_type_script">Scripts</combo_item>
<combo_item name="filter_type_sound">Sounds</combo_item>
<combo_item name="filter_type_texture">Textures</combo_item>
<combo_item name="filter_type_snapshot">Snapshots</combo_item>
<separator />
<combo_item name="filter_type_custom">Custom...</combo_item>
</combo_box>
<tab_container name="inventory filter tabs" follows="left|top|right|bottom"
bottom_delta="-487" height="480" left="2" width="463"
mouse_opaque="false" tab_position="top">

1
indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
View File

@@ -163,7 +163,6 @@
<combo_item name="Other" value="68">
Other
</combo_item>
</combo_item>
<combo_item name="Ridiculous1" value="69">
User keeps licking finger and touching me
</combo_item>

4
indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
View File

@@ -22,8 +22,8 @@
halign="center" height="20" label="Default" label_selected="Default"
left="4" mouse_opaque="true" name="Default" scale_image="true" width="64" />
<button bottom="-228" enabled="false" follows="left|bottom" font="SansSerifSmall"
halign="center" height="20" label="None" label_selected="None" left="72"
mouse_opaque="true" name="None" scale_image="true" width="64" />
halign="center" height="20" label="Alpha" label_selected="Alpha" left="72"
mouse_opaque="true" name="Alpha" scale_image="true" width="64" />
<button bottom="-252" enabled="true" follows="left|bottom" font="SansSerifSmall"
halign="center" height="20" label="Blank" label_selected="Blank" left="4"
mouse_opaque="true" name="Blank" scale_image="true" width="64" />

6
indra/newview/skins/default/xui/en-us/floater_upload_browser.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
width="650" height="340" min_width="600" min_height="340" max_width="600"
width="650" height="400" min_width="600" min_height="400" max_width="600"
name="browser" title="Upload Browser" control_name="UploadBrowserFloater">
<combo_box allow_text_entry="false" bottom="-42" follows="left|top" height="18" left="10" max_chars="20"
mouse_opaque="true" enabled="true" width="108" name="bookmark_combo" tool_tip="Jump to a common folder">
@@ -9,7 +9,7 @@
</combo_item>
</combo_box>
<button bottom_delta="0" follows="top|left" height="18" label="+"
left_delta="113" name="add_bookmark_button" tool_tip="Add current folder to Bookmarks"
left_delta="112" name="add_bookmark_button" tool_tip="Add current folder to Bookmarks"
width="20" />
<button bottom_delta="0" follows="top|left" height="18" label="-"
left_delta="22" name="remove_bookmark_button" tool_tip="Remove selected folder from Bookmarks"
@@ -52,7 +52,7 @@
mouse_opaque="true" name="filter_label" v_pad="0" width="128">
Filter:
</text>
<combo_box allow_text_entry="false" bottom_delta="-5" follows="left|bottom" height="18" left_delta="40" max_chars="20"
<combo_box allow_text_entry="false" bottom_delta="-4" follows="left|bottom" height="18" left_delta="30" max_chars="20"
mouse_opaque="true" enabled="true" width="108" name="file_filter_combo" tool_tip="Limit results to a specific type">
<combo_item name="None" value="None">
None

36
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -3,12 +3,12 @@
height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="false"
tear_off="false" width="802">
<menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
height="263" label="File" left="0" mouse_opaque="false" name="File"
opaque="true" tear_off="true" width="243">
height="263" label="File" left="0" mouse_opaque="false" name="File"
opaque="true" tear_off="true" width="243">
<menu_item_call enabled="true" label="Image (L$[COST])..."
mouse_opaque="true" name="Upload Image" shortcut="control|U" >
<on_click function="File.UploadImage" userdata="" />
<on_enable function="File.EnableUpload" />
mouse_opaque="true" name="Upload Image" shortcut="control|U" >
<on_click function="File.UploadImage" userdata="" />
<on_enable function="File.EnableUpload" />
</menu_item_call>
<menu_item_call label="Sound (L$[COST])..." name="Upload Sound"
mouse_opaque="true" enabled="true" >
@@ -16,20 +16,25 @@
<on_enable function="File.EnableUpload" />
</menu_item_call>
<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"
mouse_opaque="true" enabled="true" >
mouse_opaque="true" enabled="true" >
<on_click function="File.UploadAnim" userdata="" />
<on_enable function="File.EnableUpload" />
</menu_item_call>
<menu_item_call label="Bulk (L$[COST] per file)..." name="Bulk Upload"
mouse_opaque="true" enabled="true" >
mouse_opaque="true" enabled="true" >
<on_click function="File.UploadBulk" userdata="" />
</menu_item_call>
<menu_item_call bottom="-86" enabled="true" height="19"
label="Import XML..." left="0" mouse_opaque="true"
name="Import XML" width="243">
<on_click function="File.ImportXML" userdata="" />
<on_enable function ="File.EnableImportXML" userdata="" />
</menu_item_call>
<menu_item_call bottom="-86" enabled="true" height="19"
label="Import XML..." left="0" mouse_opaque="true"
name="Import XML" width="243">
<on_click function="File.ImportXML" userdata="" />
<on_enable function ="File.EnableImportXML" userdata="" />
</menu_item_call>
<!--<menu_item_check bottom="-384" enabled="true" height="19" label="Upload Browser" left="0"
mouse_opaque="true" name="ascentuploadbrowser" width="211">
<on_click function="ShowFloater" userdata="ascentuploadbrowser" />
<on_check function="FloaterVisible" userdata="ascentuploadbrowser" />
</menu_item_check>-->
<menu_item_separator enabled="true" label="-----------" mouse_opaque="true" name="separator" />
<menu_item_call enabled="true" label="Set Default Permissions..."
mouse_opaque="true" name="perm prefs" >
@@ -77,11 +82,6 @@
mouse_opaque="true" name="Log Out" width="243">
<on_click function="File.LogOut" userdata="" />
</menu_item_call>
<!--<menu_item_check bottom="-384" enabled="true" height="19" label="Test" left="0"
mouse_opaque="true" name="ascentuploadbrowser" width="211">
<on_click function="ShowFloater" userdata="ascentuploadbrowser" />
<on_check function="FloaterVisible" userdata="ascentuploadbrowser" />
</menu_item_check>-->
</menu>
<menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"

8
indra/newview/skins/default/xui/en-us/panel_toolbar.xml
View File

@@ -26,6 +26,14 @@
label_selected="Radar" left="0" name="radar_list_btn"
tool_tip="View a list of nearby avatars."
width="50" follows="left|right" user_resize="false"/>
<button bottom="0" font="SansSerif" height="24" label="Fly"
image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
image_selected="toolbar_btn_selected.tga"
image_unselected="toolbar_btn_enabled.tga"
image_disabled="toolbar_btn_disabled.tga" scale_image="true"
label_selected="Stop Flying" left="0" name="fly_btn"
tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
width="50" follows="left|right" user_resize="false"/>
<button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
image_selected="toolbar_btn_selected.tga"