diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml index f2de17710..caab652cf 100644 --- a/indra/newview/app_settings/settings_ascent.xml +++ b/indra/newview/app_settings/settings_ascent.xml @@ -796,5 +796,990 @@ Value pages/login/ + + ToolbarVisibleAbout + + Comment + Whether or not the button for about is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleAboutLand + + Comment + Whether or not the button for about land is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleAboutRegion + + Comment + Whether or not the button for region/estate is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleActiveSpeakers + + Comment + Whether or not the button for active speakers is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleAlwaysRun + + Comment + Whether or not the button for run is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleAnimsExplorer + + Comment + Whether or not the button for anims explorer is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleAO + + Comment + Whether or not the button for the AO Floater is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleAppearance + + Comment + Whether or not the button for appearance is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleAreaSearch + + Comment + Whether or not the button for areasearch is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleAssetBlacklist + + Comment + Whether or not the button for asset blacklist is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleBeacons + + Comment + Whether or not the button for beacons is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleBuild + + Comment + Whether or not the button for build is on the toolbar + Persist + 1 + Type + Boolean + Value + 1 + + ToolbarVisibleBuyCurrency + + Comment + Whether or not the button for buy currency is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleBuyLand + + Comment + Whether or not the button for buy land is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleCameraControls + + Comment + Whether or not the button for camera controls is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleChatbar + + Comment + Whether or not the button for toggling the chatbar is on the toolbar + Persist + 1 + Type + Boolean + Value + 1 + + ToolbarVisibleChatHistory + + Comment + Whether or not the button for local chat history is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleCommunicate + + Comment + Whether or not the button for communicate floater is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleCommunicateIM + + Comment + Whether or not the flyout button for communicate is on the toolbar + Persist + 1 + Type + Boolean + Value + 1 + + ToolbarVisibleComplaintReporter + + Comment + Whether or not the button for abuse report is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleDayCycle + + Comment + Whether or not the button for day cycle editor is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleDebugAvatar + + Comment + Whether or not the button for debug avatar textures is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleDebugConsole + + Comment + Whether or not the button for the debug console is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleDebugSettings + + Comment + Whether or not the button for debug settings is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleDisplayName + + Comment + Whether or not the button for display name is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleEditUI + + Comment + Whether or not the button for edit ui is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleEnvSettings + + Comment + Whether or not the button for the environment settings editor is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleFastTimers + + Comment + Whether or not the button for fast timers is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleFly + + Comment + Whether or not the button for fly is on the toolbar + Persist + 1 + Type + Boolean + Value + 1 + + ToolbarVisibleFontTest + + Comment + Whether or not the button for font test is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleFrameConsole + + Comment + Whether or not the button for the frame console is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleFriends + + Comment + Whether or not the button for friends is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleGestures + + Comment + Whether or not the button for gestures is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleGodTools + + Comment + Whether or not the button for god tools is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleGridOptions + + Comment + Whether or not the button for grid options for the build tools is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleGroups + + Comment + Whether or not the button for groups is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleGroupTitles + + Comment + Whether or not the button for group titles is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + + ToolbarVisibleHelpTutorial + + Comment + Whether or not the button for the tutorial is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleHTTPConsole + + Comment + Whether or not the button for the http console is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleInspect + + Comment + Whether or not the button for inspect is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleInventory + + Comment + Whether or not the button for inventory is on the toolbar + Persist + 1 + Type + Boolean + Value + 1 + + ToolbarVisibleInventoryFavs + + Comment + Whether or not the button for favorites is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleInventoryOutfits + + Comment + Whether or not the button for outfits is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleLagMeter + + Comment + Whether or not the button for lag meter is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleLocalAssets + + Comment + Whether or not the button for local textures is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleMeanEvents + + Comment + Whether or not the button for bumps, pushes, and hits is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleMediaFilter + + Comment + Whether or not the button for media filter is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleMediaTicker + + Comment + Whether or not the button for the streaming audio display is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleMemLeak + + Comment + Whether or not the button for memory leak is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleMessageLog + + Comment + Whether or not the button for message log is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleMiniMap + + Comment + Whether or not the button for the mini-map is on the toolbar + Persist + 1 + Type + Boolean + Value + 1 + + ToolbarVisibleMouselook + + Comment + Whether or not the button for mouselook is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleMovementControls + + Comment + Whether or not the button for movement controls is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleMuteList + + Comment + Whether or not the button for mute list is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleMyLand + + Comment + Whether or not the button for my land is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleOutbox + + Comment + Whether or not the button for outbox is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleNotificationsConsole + + Comment + Whether or not the button for the notifications console is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleOutbox + + Comment + Whether or not the button for the merchant outbox is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleOutfit + + Comment + Whether or not the button for make outfit is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisiblePathfindingCharacters + + Comment + Whether or not the button for pathfinding characters is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisiblePathfindingLinksets + + Comment + Whether or not the button for pathfinding linksets is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisiblePermPrefs + + Comment + Whether or not the button for default upload permissions is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisiblePostProcess + + Comment + Whether or not the button for post-processing effects is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisiblePreferences + + Comment + Whether or not the button for preferences is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleRadar + + Comment + Whether or not the button for the radar is on the toolbar + Persist + 1 + Type + Boolean + Value + 1 + + ToolbarVisibleRegionDebugConsole + + Comment + Whether or not the button for the region debug console is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleScriptErrors + + Comment + Whether or not the button for script errors is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleScriptInfo + + Comment + Whether or not the button for script info is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleSearch + + Comment + Whether or not the button for search is on the toolbar + Persist + 1 + Type + Boolean + Value + 1 + + ToolbarVisibleSit + + Comment + Whether or not the button for sit is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleSnapshot + + Comment + Whether or not the button for snapshot is on the toolbar + Persist + 1 + Type + Boolean + Value + 1 + + ToolbarVisibleSoundExplorer + + Comment + Whether or not the button for the sound explorer is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleStatBar + + Comment + Whether or not the button for the statistics bar is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleTeleportHistory + + Comment + Whether or not the button for teleport history is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleTest + + Comment + Whether or not the button for the test floater is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleTextureCategoryConsole + + Comment + Whether or not the button for the texture category console is on the toolbar (requires a relog with AuditTexture true for the button to work) + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleTextureConsole + + Comment + Whether or not the button for the texture console is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleTextureSizeConsole + + Comment + Whether or not the button for the texture size console is on the toolbar (requires a relog with AuditTexture true for the button to work) + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleToolbarPrefs + + Comment + Whether or not the button for the floater to change buttons on the toolbar is on the toolbar (Nonfunctional, yet. Poke Liru.) + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleVelocity + + Comment + Whether or not the button for velocity is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleVoiceEffect + + Comment + Whether or not the button for voice effects is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleWaterSettings + + Comment + Whether or not the button for the water editor is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleWeb + + Comment + Whether or not the button for the web browser is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleWindlight + + Comment + Whether or not the button for the windlight editor is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleWorldMap + + Comment + Whether or not the button for the world map is on the toolbar + Persist + 1 + Type + Boolean + Value + 1 + + + ToolbarVisibleRLVLocks + + Comment + Whether or not the button for RLVa Locks is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleRLVRestrictions + + Comment + Whether or not the button for RLVa Restrictions is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + ToolbarVisibleRLVStrings + + Comment + Whether or not the button for RLVa Strings is on the toolbar + Persist + 1 + Type + Boolean + Value + 0 + + diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index 32ebb9c40..a8eca6107 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -37,6 +37,7 @@ #include "aihttpview.h" #include "floaterao.h" #include "floaterlocalassetbrowse.h" +#include "hbfloatergrouptitles.h" #include "jcfloaterareasearch.h" #include "llagentcamera.h" #include "llchatbar.h" @@ -165,22 +166,27 @@ struct MenuFloaterDict : public LLSingleton } registerConsole("velocity", gVelocityBar); registerFloater("about", boost::bind(&LLFloaterAbout::show,(void*)NULL)); - registerFloater("ao", boost::bind(LLFloaterAO::show, (void*)NULL)); registerFloater("always run", boost::bind(toggle_always_run), boost::bind(&LLAgent::getAlwaysRun, &gAgent)); + registerFloater("anims_explorer", boost::bind(LLFloaterExploreAnimations::show)); + registerFloater("ao", boost::bind(LLFloaterAO::show, (void*)NULL)); registerFloater("appearance", boost::bind(LLFloaterCustomize::show)); + registerFloater("asset_blacklist", boost::bind(LLFloaterBlacklist::toggle), boost::bind(LLFloaterBlacklist::visible)); registerFloater("build", boost::bind(toggle_build)); registerFloater("buy currency", boost::bind(LLFloaterBuyCurrency::buyCurrency)); registerFloater("buy land", boost::bind(&LLViewerParcelMgr::startBuyLand, boost::bind(LLViewerParcelMgr::getInstance), false)); registerFloater("chatbar", boost::bind(handle_chat)); registerFloater("complaint reporter", boost::bind(LLFloaterReporter::showFromMenu, COMPLAINT_REPORT)); + registerFloater("DayCycle", boost::bind(LLFloaterDayCycle::show), boost::bind(LLFloaterDayCycle::isOpen)); registerFloater("debug avatar", boost::bind(handle_debug_avatar_textures, (void*)NULL)); registerFloater("debug settings", boost::bind(handle_singleton_toggle, (void*)NULL)); registerFloater("displayname", boost::bind(LLFloaterDisplayName::show)); registerFloater("edit ui", boost::bind(LLFloaterEditUI::show, (void*)NULL)); + registerFloater("EnvSettings", boost::bind(LLFloaterEnvSettings::show), boost::bind(LLFloaterEnvSettings::isOpen)); registerFloater("fly", boost::bind(LLAgent::toggleFlying)); registerFloater("font test", boost::bind(LLFloaterFontTest::show, (void*)NULL)); registerFloater("god tools", boost::bind(LLFloaterGodTools::show, (void*)NULL)); - registerFloater("grid options", boost::bind(LLFloaterBuildOptions::show, (void*)NULL)); + registerFloater("grid options", boost::bind(LLFloaterBuildOptions::show, (void*)NULL)); + registerFloater("group titles", boost::bind(HBFloaterGroupTitles::toggle)); //Singu TODO: Re-implement f1 help. //registerFloater("help f1", boost::bind(/*gViewerHtmlHelp.show*/)); registerFloater("help tutorial", boost::bind(LLFloaterHUD::showHUD)); @@ -194,25 +200,21 @@ struct MenuFloaterDict : public LLSingleton registerFloater("mouselook", boost::bind(toggle_mouselook)); registerFloater("my land", boost::bind(LLFloaterLandHoldings::show, (void*)NULL)); registerFloater("outfit", boost::bind(show_outfit_dialog)); + registerFloater("PostProcess", boost::bind(LLFloaterPostProcess::show)); registerFloater("preferences", boost::bind(LLFloaterPreference::show, (void*)NULL)); + registerFloater("RegionDebugConsole", boost::bind(handle_singleton_toggle, (void*)NULL), boost::bind(LLFloaterRegionDebugConsole::instanceExists)); registerFloater("script errors", boost::bind(LLFloaterScriptDebug::show, LLUUID::null)); registerFloater("search", boost::bind(toggle_search_floater)); + registerFloater("sit", boost::bind(toggle_sit)); registerFloater("snapshot", boost::bind(LLFloaterSnapshot::show, (void*)NULL)); + registerFloater("sound_explorer", boost::bind(LLFloaterExploreSounds::toggle), boost::bind(LLFloaterExploreSounds::visible)); registerFloater("test", boost::bind(LLFloaterTest::show, (void*)NULL)); // Phoenix: Wolfspirit: Enabled Show Floater out of viewer menu registerFloater("toolbar", boost::bind(toggle_control, "ShowToolBar"), boost::bind(&LLToolBar::getVisible, gToolBar)); - registerFloater("web", boost::bind(LLFloaterWebContent::showInstance, "dict web", LLFloaterWebContent::Params())); - registerFloater("world map", boost::bind(LLFloaterWorldMap::toggle)); - registerFloater("anims_explorer", boost::bind(LLFloaterExploreAnimations::show)); - registerFloater("sound_explorer", boost::bind(LLFloaterExploreSounds::toggle), boost::bind(LLFloaterExploreSounds::visible)); - registerFloater("asset_blacklist", boost::bind(LLFloaterBlacklist::toggle), boost::bind(LLFloaterBlacklist::visible)); - registerFloater("DayCycle", boost::bind(LLFloaterDayCycle::show), boost::bind(LLFloaterDayCycle::isOpen)); - registerFloater("EnvSettings", boost::bind(LLFloaterEnvSettings::show), boost::bind(LLFloaterEnvSettings::isOpen)); - registerFloater("PostProcess", boost::bind(LLFloaterPostProcess::show)); - registerFloater("RegionDebugConsole", boost::bind(handle_singleton_toggle, (void*)NULL), boost::bind(LLFloaterRegionDebugConsole::instanceExists)); registerFloater("WaterSettings", boost::bind(LLFloaterWater::show), boost::bind(LLFloaterWater::isOpen)); + registerFloater("web", boost::bind(LLFloaterWebContent::showInstance, "dict web", LLFloaterWebContent::Params())); registerFloater("Windlight", boost::bind(LLFloaterWindLight::show), boost::bind(LLFloaterWindLight::isOpen)); - registerFloater ("im"); + registerFloater("world map", boost::bind(LLFloaterWorldMap::toggle)); registerFloater ("about land"); registerFloater ("about region"); registerFloater ("active speakers"); @@ -224,6 +226,7 @@ struct MenuFloaterDict : public LLSingleton registerFloater ("friends", 0); registerFloater ("gestures"); registerFloater ("groups", 1); + registerFloater ("im"); registerFloater ("lag meter"); registerFloater ("media filter"); registerFloater ("mini map"); @@ -231,14 +234,14 @@ struct MenuFloaterDict : public LLSingleton registerFloater ("mute list"); registerFloater ("notifications console"); registerFloater ("outbox"); + registerFloater ("pathfinding_characters"); + registerFloater ("pathfinding_linksets"); registerFloater ("perm prefs"); registerFloater ("radar"); registerFloater ("script info"); registerFloater ("stat bar"); registerFloater ("teleport history"); registerFloater ("voice effect"); - registerFloater ("pathfinding_characters"); - registerFloater ("pathfinding_linksets"); // [RLVa:LF] registerFloater("rlv restrictions"); registerFloater("rlv locks"); @@ -248,7 +251,7 @@ struct MenuFloaterDict : public LLSingleton template void registerConsole(const std::string& name, T* console) { - registerFloater(name, boost::bind(&T::setVisible, console, boost::bind(&T::getVisible, console)), boost::bind(&T::getVisible, console)); + registerFloater(name, boost::bind(&T::setVisible, console, !boost::bind(&T::getVisible, console)), boost::bind(&T::getVisible, console)); } void registerFloater(const std::string& name, boost::function show, boost::function visible = NULL) { diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp index 1cd6cf2ad..aa1f83153 100644 --- a/indra/newview/rlvui.cpp +++ b/indra/newview/rlvui.cpp @@ -48,6 +48,7 @@ #include "llfloateravatarlist.h" #include "llfloaterworldmap.h" #include "llmenugl.h" +#include "lltoolbar.h" #include "lluictrlfactory.h" #include "llviewerregion.h" @@ -251,6 +252,8 @@ void RlvUIEnabler::onToggleShowInv(bool fQuitting) LLMenuGL::sMenuContainer->childSetEnabled("My Outfits", true); LLMenuGL::sMenuContainer->childSetEnabled("Favorites", true); } + gToolBar->childSetEnabled("outfits_btn", fEnable); + gToolBar->childSetEnabled("favs_btn", fEnable); } // Checked: 2010-04-22 (RLVa-1.2.0f) | Modified: RLVa-1.2.0f diff --git a/indra/newview/skins/default/textures/icn_toolbar_about_land.tga b/indra/newview/skins/default/textures/icn_toolbar_about_land.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_about_land.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_about_region.tga b/indra/newview/skins/default/textures/icn_toolbar_about_region.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_about_region.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_about_viewer.tga b/indra/newview/skins/default/textures/icn_toolbar_about_viewer.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_about_viewer.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_anims_explorer.tga b/indra/newview/skins/default/textures/icn_toolbar_anims_explorer.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_anims_explorer.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_ao.tga b/indra/newview/skins/default/textures/icn_toolbar_ao.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_ao.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_appearance.tga b/indra/newview/skins/default/textures/icn_toolbar_appearance.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_appearance.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_areasearch.tga b/indra/newview/skins/default/textures/icn_toolbar_areasearch.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_areasearch.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_asset_blacklist.tga b/indra/newview/skins/default/textures/icn_toolbar_asset_blacklist.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_asset_blacklist.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_beacons.tga b/indra/newview/skins/default/textures/icn_toolbar_beacons.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_beacons.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_bumps.tga b/indra/newview/skins/default/textures/icn_toolbar_bumps.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_bumps.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_buy_currency.tga b/indra/newview/skins/default/textures/icn_toolbar_buy_currency.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_buy_currency.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_buy_land.tga b/indra/newview/skins/default/textures/icn_toolbar_buy_land.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_buy_land.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_camera_controls.tga b/indra/newview/skins/default/textures/icn_toolbar_camera_controls.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_camera_controls.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_change_buttons.tga b/indra/newview/skins/default/textures/icn_toolbar_change_buttons.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_change_buttons.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_day_cycle_editor.tga b/indra/newview/skins/default/textures/icn_toolbar_day_cycle_editor.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_day_cycle_editor.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_debug_avatar.tga b/indra/newview/skins/default/textures/icn_toolbar_debug_avatar.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_debug_avatar.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_debug_console.tga b/indra/newview/skins/default/textures/icn_toolbar_debug_console.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_debug_console.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_debug_settings.tga b/indra/newview/skins/default/textures/icn_toolbar_debug_settings.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_debug_settings.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_display_name.tga b/indra/newview/skins/default/textures/icn_toolbar_display_name.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_display_name.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_edit_ui.tga b/indra/newview/skins/default/textures/icn_toolbar_edit_ui.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_edit_ui.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_env_editor.tga b/indra/newview/skins/default/textures/icn_toolbar_env_editor.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_env_editor.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_fast_timers.tga b/indra/newview/skins/default/textures/icn_toolbar_fast_timers.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_fast_timers.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_favorites.tga b/indra/newview/skins/default/textures/icn_toolbar_favorites.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_favorites.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_font_test.tga b/indra/newview/skins/default/textures/icn_toolbar_font_test.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_font_test.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_frame_console.tga b/indra/newview/skins/default/textures/icn_toolbar_frame_console.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_frame_console.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_friends.tga b/indra/newview/skins/default/textures/icn_toolbar_friends.tga new file mode 100644 index 000000000..0a1a235f3 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_friends.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_gestures.tga b/indra/newview/skins/default/textures/icn_toolbar_gestures.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_gestures.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_god_tools.tga b/indra/newview/skins/default/textures/icn_toolbar_god_tools.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_god_tools.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_grid_options.tga b/indra/newview/skins/default/textures/icn_toolbar_grid_options.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_grid_options.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_group_titles.tga b/indra/newview/skins/default/textures/icn_toolbar_group_titles.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_group_titles.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_groups.tga b/indra/newview/skins/default/textures/icn_toolbar_groups.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_groups.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_http_console.tga b/indra/newview/skins/default/textures/icn_toolbar_http_console.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_http_console.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_im.tga b/indra/newview/skins/default/textures/icn_toolbar_im.tga new file mode 100644 index 000000000..0a1a235f3 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_im.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_inspect.tga b/indra/newview/skins/default/textures/icn_toolbar_inspect.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_inspect.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_lag_meter.tga b/indra/newview/skins/default/textures/icn_toolbar_lag_meter.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_lag_meter.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_local_assets.tga b/indra/newview/skins/default/textures/icn_toolbar_local_assets.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_local_assets.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_local_chat.tga b/indra/newview/skins/default/textures/icn_toolbar_local_chat.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_local_chat.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_make_outfit.tga b/indra/newview/skins/default/textures/icn_toolbar_make_outfit.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_make_outfit.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_media_filter.tga b/indra/newview/skins/default/textures/icn_toolbar_media_filter.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_media_filter.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_media_ticker.tga b/indra/newview/skins/default/textures/icn_toolbar_media_ticker.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_media_ticker.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_memleak.tga b/indra/newview/skins/default/textures/icn_toolbar_memleak.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_memleak.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_message_log.tga b/indra/newview/skins/default/textures/icn_toolbar_message_log.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_message_log.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_mouselook.tga b/indra/newview/skins/default/textures/icn_toolbar_mouselook.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_mouselook.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_movement_controls.tga b/indra/newview/skins/default/textures/icn_toolbar_movement_controls.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_movement_controls.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_mute_list.tga b/indra/newview/skins/default/textures/icn_toolbar_mute_list.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_mute_list.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_my_land.tga b/indra/newview/skins/default/textures/icn_toolbar_my_land.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_my_land.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_notifications_console.tga b/indra/newview/skins/default/textures/icn_toolbar_notifications_console.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_notifications_console.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_outbox.tga b/indra/newview/skins/default/textures/icn_toolbar_outbox.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_outbox.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_outfits.tga b/indra/newview/skins/default/textures/icn_toolbar_outfits.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_outfits.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_pathfinding_characters.tga b/indra/newview/skins/default/textures/icn_toolbar_pathfinding_characters.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_pathfinding_characters.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_pathing_linksets.tga b/indra/newview/skins/default/textures/icn_toolbar_pathing_linksets.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_pathing_linksets.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_post_process.tga b/indra/newview/skins/default/textures/icn_toolbar_post_process.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_post_process.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_preferences.tga b/indra/newview/skins/default/textures/icn_toolbar_preferences.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_preferences.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_region_console.tga b/indra/newview/skins/default/textures/icn_toolbar_region_console.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_region_console.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_report_abuse.tga b/indra/newview/skins/default/textures/icn_toolbar_report_abuse.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_report_abuse.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_rlv_locks.tga b/indra/newview/skins/default/textures/icn_toolbar_rlv_locks.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_rlv_locks.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_rlv_restrictions.tga b/indra/newview/skins/default/textures/icn_toolbar_rlv_restrictions.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_rlv_restrictions.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_rlv_strings.tga b/indra/newview/skins/default/textures/icn_toolbar_rlv_strings.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_rlv_strings.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_run.tga b/indra/newview/skins/default/textures/icn_toolbar_run.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_run.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_script_errors.tga b/indra/newview/skins/default/textures/icn_toolbar_script_errors.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_script_errors.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_script_info.tga b/indra/newview/skins/default/textures/icn_toolbar_script_info.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_script_info.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_sit.tga b/indra/newview/skins/default/textures/icn_toolbar_sit.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_sit.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_sound_explorer.tga b/indra/newview/skins/default/textures/icn_toolbar_sound_explorer.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_sound_explorer.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_stats.tga b/indra/newview/skins/default/textures/icn_toolbar_stats.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_stats.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_teleport_history.tga b/indra/newview/skins/default/textures/icn_toolbar_teleport_history.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_teleport_history.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_test.tga b/indra/newview/skins/default/textures/icn_toolbar_test.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_test.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_texture_category_console.tga b/indra/newview/skins/default/textures/icn_toolbar_texture_category_console.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_texture_category_console.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_texture_console.tga b/indra/newview/skins/default/textures/icn_toolbar_texture_console.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_texture_console.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_texture_size_console.tga b/indra/newview/skins/default/textures/icn_toolbar_texture_size_console.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_texture_size_console.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_tutorial.tga b/indra/newview/skins/default/textures/icn_toolbar_tutorial.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_tutorial.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_upload_perms.tga b/indra/newview/skins/default/textures/icn_toolbar_upload_perms.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_upload_perms.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_voice_effects.tga b/indra/newview/skins/default/textures/icn_toolbar_voice_effects.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_voice_effects.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_water_editor.tga b/indra/newview/skins/default/textures/icn_toolbar_water_editor.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_water_editor.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_web.tga b/indra/newview/skins/default/textures/icn_toolbar_web.tga new file mode 100644 index 000000000..49e5d11a2 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_web.tga differ diff --git a/indra/newview/skins/default/textures/icn_toolbar_windlight.tga b/indra/newview/skins/default/textures/icn_toolbar_windlight.tga new file mode 100644 index 000000000..0a1a235f3 Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_windlight.tga differ diff --git a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml index efcbd1712..667b1703f 100644 --- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml +++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml @@ -5,62 +5,456 @@ 1 IM - - - - + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +