From d21e5db701a23d38012edc86940d15673f8751d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sat, 5 Oct 2019 01:54:06 -0400 Subject: [PATCH 01/66] Fix the group founder name --- indra/newview/skins/default/xui/en-us/panel_group_general.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/indra/newview/skins/default/xui/en-us/panel_group_general.xml index 6a1509cf1..7c8f22dfe 100644 --- a/indra/newview/skins/default/xui/en-us/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en-us/panel_group_general.xml @@ -30,7 +30,7 @@ Hover your mouse over the options for more help. From 33ef6cc3f7a107a94d6cfb7f35214bf288389273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Mon, 7 Oct 2019 23:38:34 -0400 Subject: [PATCH 02/66] Initial alteration of namebox for clicky stuffs Should allow left clicking of certain name textboxes to bring up profiles Removes old dead variables Cleans up includes --- indra/llui/lltextbox.h | 1 + indra/newview/llnamebox.cpp | 62 +++++++++++++------------------------ indra/newview/llnamebox.h | 10 +++--- 3 files changed, 26 insertions(+), 47 deletions(-) diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h index 738ec3b06..b64b7fcb0 100644 --- a/indra/llui/lltextbox.h +++ b/indra/llui/lltextbox.h @@ -139,6 +139,7 @@ private: LLFontGL::VAlign mVAlign; std::vector mLineLengthList; +protected: callback_t mClickedCallback; }; diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp index 28381301d..1814e7e59 100644 --- a/indra/newview/llnamebox.cpp +++ b/indra/newview/llnamebox.cpp @@ -34,35 +34,28 @@ #include "llnamebox.h" -#include "llerror.h" -#include "llfontgl.h" -#include "llui.h" -#include "llviewercontrol.h" -#include "lluuid.h" - #include "llcachename.h" -#include "llagent.h" +#include "lltrans.h" + +#include "llavataractions.h" +#include "llgroupactions.h" // statics std::set LLNameBox::sInstances; static LLRegisterWidget r("name_box"); - LLNameBox::LLNameBox(const std::string& name) -: LLTextBox(name, LLRect(), "" , NULL, TRUE) +: LLTextBox(name, LLRect(), LLStringUtil::null, nullptr, TRUE) +, mInitialValue(LLTrans::getString("LoadingData")) { - mNameID = LLUUID::null; - mLink = false; - //mParseHTML = mLink; // STORM-215 - mInitialValue = "(retrieving)"; - LLNameBox::sInstances.insert(this); + sInstances.insert(this); setText(LLStringUtil::null); } LLNameBox::~LLNameBox() { - LLNameBox::sInstances.erase(this); + sInstances.erase(this); } void LLNameBox::setNameID(const LLUUID& name_id, BOOL is_group) @@ -81,58 +74,45 @@ void LLNameBox::setNameID(const LLUUID& name_id, BOOL is_group) got_name = gCacheName->getGroupName(name_id, name); } + // At this point, if no callback has been set, set one + if (!mClickedCallback) + setClickedCallback(boost::bind(&LLNameBox::showProfile, this)); + + mIsGroup = is_group; + // Got the name already? Set it. // Otherwise it will be set later in refresh(). - if (got_name) - setName(name, is_group); - else - setText(mInitialValue); + setText(got_name ? name : mInitialValue); } void LLNameBox::refresh(const LLUUID& id, const std::string& full_name, bool is_group) { if (id == mNameID) { - setName(full_name, is_group); + setText(full_name); } } void LLNameBox::refreshAll(const LLUUID& id, const std::string& full_name, bool is_group) { - std::set::iterator it; - for (it = LLNameBox::sInstances.begin(); - it != LLNameBox::sInstances.end(); - ++it) + for (auto& box : sInstances) { - LLNameBox* box = *it; box->refresh(id, full_name, is_group); } } -void LLNameBox::setName(const std::string& name, BOOL is_group) +void LLNameBox::showProfile() { - if (mLink) - { - std::string url; - - if (is_group) - url = "[secondlife:///app/group/" + mNameID.asString() + "/about " + name + "]"; - else - url = "[secondlife:///app/agent/" + mNameID.asString() + "/about " + name + "]"; - - setText(url); - } + if (mIsGroup) + LLGroupActions::show(mNameID); else - { - setText(name); - } + LLAvatarActions::showProfile(mNameID); } // virtual void LLNameBox::initFromXML(LLXMLNodePtr node, LLView* parent) { LLTextBox::initFromXML(node, parent); - node->getAttributeBOOL("link", mLink); node->getAttributeString("initial_value", mInitialValue); } diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h index 0d5ec6a83..ad2b268d9 100644 --- a/indra/newview/llnamebox.h +++ b/indra/newview/llnamebox.h @@ -55,20 +55,18 @@ public: static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group); + void showProfile(); + protected: - LLNameBox (const std::string& name); + LLNameBox(const std::string& name); friend class LLUICtrlFactory; private: - void setName(const std::string& name, BOOL is_group); - static std::set sInstances; -private: LLUUID mNameID; - BOOL mLink; + bool mIsGroup; std::string mInitialValue; - }; #endif From 8f3b10875ebe09cebb28c703851bda8cb4ae42d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Mon, 7 Oct 2019 23:46:09 -0400 Subject: [PATCH 03/66] Introduce LFIDBearer, a Class for menu bearing UI that offers IDs to menus Move menu code from scroll list into there Separate out interface for getting IDs No longer bother with the focus manager, for menus where not necessary, this ensures that if focus suddenly changes, it won't break menu UX flow. Clean up all the static functions by using new static class functions --- indra/llui/CMakeLists.txt | 2 + indra/llui/lfidbearer.cpp | 33 +++++++++ indra/llui/lfidbearer.h | 45 ++++++++++++ indra/llui/llscrolllistctrl.cpp | 9 +-- indra/llui/llscrolllistctrl.h | 11 ++- indra/newview/llfloateravatarlist.cpp | 4 +- indra/newview/llviewermenu.cpp | 98 +++++++++++---------------- indra/newview/llviewermenu.h | 2 - 8 files changed, 127 insertions(+), 77 deletions(-) create mode 100644 indra/llui/lfidbearer.cpp create mode 100644 indra/llui/lfidbearer.h diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt index b00081882..11b8c800e 100644 --- a/indra/llui/CMakeLists.txt +++ b/indra/llui/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ) set(llui_SOURCE_FILES + lfidbearer.cpp llaccordionctrl.cpp llaccordionctrltab.cpp llalertdialog.cpp @@ -101,6 +102,7 @@ set(llui_HEADER_FILES CMakeLists.txt ailist.h + lfidbearer.h llaccordionctrl.h llaccordionctrltab.h llalertdialog.h diff --git a/indra/llui/lfidbearer.cpp b/indra/llui/lfidbearer.cpp new file mode 100644 index 000000000..cc7a3f988 --- /dev/null +++ b/indra/llui/lfidbearer.cpp @@ -0,0 +1,33 @@ +/* Copyright (C) 2019 Liru Færs + * + * LFIDBearer is a class that holds an ID or IDs that menus can use + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA */ + +#include "linden_common.h" +#include "lfidbearer.h" +#include "llmenugl.h" + +std::vector LFIDBearer::sMenus = {}; +LFIDBearer* LFIDBearer::sActive = nullptr; + +void LFIDBearer::showMenu(LLView* self, LLMenuGL* menu, S32 x, S32 y) +{ + sActive = this; // Menu listeners rely on this + menu->buildDrawLabels(); + menu->updateParent(LLMenuGL::sMenuContainer); + LLMenuGL::showPopup(self, menu, x, y); +} diff --git a/indra/llui/lfidbearer.h b/indra/llui/lfidbearer.h new file mode 100644 index 000000000..8b4c7684d --- /dev/null +++ b/indra/llui/lfidbearer.h @@ -0,0 +1,45 @@ +/* Copyright (C) 2019 Liru Færs + * + * LFIDBearer is a class that holds an ID or IDs that menus can use + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA */ + +#pragma once + +#include "lluuid.h" + +class LLMenuGL; +class LLView; + +struct LFIDBearer +{ + virtual ~LFIDBearer() { if (sActive == this) sActive = nullptr; } + virtual LLUUID getStringUUIDSelectedItem() const = 0; + virtual uuid_vec_t getSelectedIDs() const = 0; + virtual S32 getNumSelected() const = 0; + + template static T* getActive() { return static_cast(sActive); } + static LLUUID getActiveSelectedID() { return sActive->getStringUUIDSelectedItem(); } + static uuid_vec_t getActiveSelectedIDs() { return sActive->getSelectedIDs(); } + static S32 getActiveNumSelected() { return sActive->getNumSelected(); } + + void showMenu(LLView* self, LLMenuGL* menu, S32 x, S32 y); + static void addCommonMenu(LLMenuGL* menu) { sMenus.push_back(menu); } + +protected: + static std::vector sMenus; // Menus that recur, such as general avatars or groups menus + static LFIDBearer* sActive; +}; diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 2aa1b17ec..d1a187d0c 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -59,8 +59,6 @@ static LLRegisterWidget r("scroll_list"); -std::vector LLScrollListCtrl::sMenus = {}; // List menus that recur, such as general avatars or groups menus - // local structures & classes. struct SortScrollListItem { @@ -314,7 +312,7 @@ std::vector LLScrollListCtrl::getAllSelected() const return ret; } -uuid_vec_t LLScrollListCtrl::getSelectedIDs() +uuid_vec_t LLScrollListCtrl::getSelectedIDs() const { uuid_vec_t ids; if (!getCanSelect()) return ids; @@ -1813,10 +1811,7 @@ BOOL LLScrollListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask) if (col->mHeader && col->mHeader->getRect().pointInRect(x,y)) // Right clicking a column header shouldn't bring up a menu return FALSE; } - gFocusMgr.setKeyboardFocus(this); // Menu listeners rely on this - mPopupMenu->buildDrawLabels(); - mPopupMenu->updateParent(LLMenuGL::sMenuContainer); - LLMenuGL::showPopup(this, mPopupMenu, x, y); + showMenu(this, mPopupMenu, x, y); return TRUE; } diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index e52f41ee9..c09af350a 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -32,6 +32,7 @@ #include #include +#include "lfidbearer.h" #include "lluictrl.h" #include "llctrlselectioninterface.h" #include "llfontgl.h" @@ -48,6 +49,7 @@ class LLMenuGL; class LLScrollListCtrl : public LLUICtrl, public LLEditMenuHandler, public LLCtrlListInterface, public LLCtrlScrollInterface +, public LFIDBearer { public: typedef boost::function callback_t; @@ -194,13 +196,13 @@ public: // "StringUUID" interface: use this when you're creating a list that contains non-unique strings each of which // has an associated, unique UUID, and only one of which can be selected at a time. LLScrollListItem* addStringUUIDItem(const std::string& item_text, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE); - LLUUID getStringUUIDSelectedItem() const; + LLUUID getStringUUIDSelectedItem() const override final; LLScrollListItem* getFirstSelected() const; virtual S32 getFirstSelectedIndex() const; std::vector getAllSelected() const; - uuid_vec_t getSelectedIDs(); //Helper. Much like getAllSelected, but just provides a LLUUID vec - S32 getNumSelected() const; + uuid_vec_t getSelectedIDs() const override final; //Helper. Much like getAllSelected, but just provides a LLUUID vec + S32 getNumSelected() const override final; LLScrollListItem* getLastSelectedItem() const { return mLastSelected; } // iterate over all items @@ -255,7 +257,6 @@ public: // support right-click context menus for avatar/group lists void setContextMenu(LLMenuGL* menu) { mPopupMenu = menu; } void setContextMenu(S32 index) { mPopupMenu = sMenus[index]; } - static void addCommonMenu(LLMenuGL* menu) { sMenus.push_back(menu); } // Overridden from LLView /*virtual*/ void draw(); @@ -468,8 +469,6 @@ private: class LLViewBorder* mBorder; LLMenuGL *mPopupMenu; - static std::vector sMenus; // List menus that recur, such as general avatars or groups menus - LLView *mCommentTextView; LLWString mSearchString; diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index 51122e51b..9d6264f3c 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -378,7 +378,7 @@ namespace { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLFloaterAvatarList::setFocusAvatar(get_focused_list_id_selected()); + LLFloaterAvatarList::setFocusAvatar(LFIDBearer::getActiveSelectedID()); return true; } }; @@ -405,7 +405,7 @@ namespace { bool handleEvent(LLPointer event, const LLSD& userdata) { - teleport_to(get_focused_list_id_selected()); + teleport_to(LFIDBearer::getActiveSelectedID()); return true; } }; diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 291f0b17b..8f3e64f19 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -34,6 +34,7 @@ #include "llviewermenu.h" // linden library includes +#include "lfidbearer.h" #include "llanimationstates.h" // For ANIM_AGENT_AWAY #include "llavatarnamecache.h" // IDEVO #include "llinventorypanel.h" @@ -763,8 +764,8 @@ void init_menus() gMenuHolder->addChild(gLoginMenuBarView); // Singu Note: Initialize common ScrollListMenus here - LLScrollListCtrl::addCommonMenu(LLUICtrlFactory::getInstance()->buildMenu("menu_avs_list.xml", gMenuHolder)); // 0 - //LLScrollListCtrl::addCommonMenu(LLUICtrlFactory::getInstance()->buildMenu("menu_groups_list.xml")); // 1 // Singu TODO + LFIDBearer::addCommonMenu(LLUICtrlFactory::getInstance()->buildMenu("menu_avs_list.xml", gMenuHolder)); // 0 + //LFIDBearer::addCommonMenu(LLUICtrlFactory::getInstance()->buildMenu("menu_groups_list.xml")); // 1 // Singu TODO LLView* ins = gMenuBarView->getChildView("insert_world", true, false); ins->setVisible(false); @@ -9051,27 +9052,6 @@ template T* get_focused() return t; } -S32 get_focused_list_num_selected() -{ - if (auto list = get_focused()) - return list->getNumSelected(); - return 0; -} - -const LLUUID get_focused_list_id_selected() -{ - if (auto list = get_focused()) - return list->getStringUUIDSelectedItem(); - return LLUUID::null; -} - -const uuid_vec_t get_focused_list_ids_selected() -{ - if (auto list = get_focused()) - return list->getSelectedIDs(); - return uuid_vec_t(); -} - const LLWString get_slurl_for(const LLUUID& id, bool group) { std::string str("secondlife:///app/"); @@ -9088,7 +9068,7 @@ class ListEnableAnySelected : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - gMenuHolder->findControl(userdata["control"].asString())->setValue(get_focused_list_num_selected()); + gMenuHolder->findControl(userdata["control"].asString())->setValue(LFIDBearer::getActiveNumSelected()); return true; } }; @@ -9097,7 +9077,7 @@ class ListEnableMultipleSelected : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - gMenuHolder->findControl(userdata["control"].asString())->setValue(get_focused_list_num_selected() > 1); + gMenuHolder->findControl(userdata["control"].asString())->setValue(LFIDBearer::getActiveNumSelected() > 1); return true; } }; @@ -9106,7 +9086,7 @@ class ListEnableSingleSelected : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - gMenuHolder->findControl(userdata["control"].asString())->setValue(get_focused_list_num_selected() == 1); + gMenuHolder->findControl(userdata["control"].asString())->setValue(LFIDBearer::getActiveNumSelected() == 1); return true; } }; @@ -9115,8 +9095,6 @@ class ListEnableCall : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - auto list = get_focused(); - if (!list) return false; gMenuHolder->findControl(userdata["control"].asString())->setValue(LLAvatarActions::canCall()); return true; } @@ -9126,7 +9104,7 @@ class ListEnableIsFriend : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - gMenuHolder->findControl(userdata["control"].asString())->setValue(LLAvatarActions::isFriend(get_focused_list_id_selected())); + gMenuHolder->findControl(userdata["control"].asString())->setValue(LLAvatarActions::isFriend(LFIDBearer::getActiveSelectedID())); return true; } }; @@ -9135,7 +9113,7 @@ class ListEnableIsNotFriend : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - gMenuHolder->findControl(userdata["control"].asString())->setValue(!LLAvatarActions::isFriend(get_focused_list_id_selected())); + gMenuHolder->findControl(userdata["control"].asString())->setValue(!LLAvatarActions::isFriend(LFIDBearer::getActiveSelectedID())); return true; } }; @@ -9144,7 +9122,7 @@ class ListEnableMute : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - const uuid_vec_t& ids = get_focused_list_ids_selected(); + const uuid_vec_t& ids = LFIDBearer::getActiveSelectedIDs(); bool can_block = true; for (uuid_vec_t::const_iterator it = ids.begin(); can_block && it != ids.end(); ++it) can_block = LLAvatarActions::canBlock(*it); @@ -9157,7 +9135,7 @@ class ListEnableOfferTeleport : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - gMenuHolder->findControl(userdata["control"].asString())->setValue(LLAvatarActions::canOfferTeleport(get_focused_list_ids_selected())); + gMenuHolder->findControl(userdata["control"].asString())->setValue(LLAvatarActions::canOfferTeleport(LFIDBearer::getActiveSelectedIDs())); return true; } }; @@ -9166,7 +9144,7 @@ class ListVisibleWebProfile : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - gMenuHolder->findControl(userdata["control"].asString())->setValue(get_focused_list_num_selected() && !(gSavedSettings.getBOOL("UseWebProfiles") || gSavedSettings.getString("WebProfileURL").empty())); + gMenuHolder->findControl(userdata["control"].asString())->setValue(LFIDBearer::getActiveNumSelected() && !(gSavedSettings.getBOOL("UseWebProfiles") || gSavedSettings.getString("WebProfileURL").empty())); return true; } }; @@ -9176,7 +9154,7 @@ class ListBanFromGroup : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - ban_from_group(get_focused_list_ids_selected()); + ban_from_group(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9185,7 +9163,7 @@ class ListCopySLURL : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - copy_profile_uri(get_focused_list_id_selected(), false); + copy_profile_uri(LFIDBearer::getActiveSelectedID(), false); return true; } }; @@ -9194,7 +9172,7 @@ class ListCopyUUIDs : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::copyUUIDs(get_focused_list_ids_selected()); + LLAvatarActions::copyUUIDs(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9203,7 +9181,7 @@ class ListInviteToGroup : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::inviteToGroup(get_focused_list_ids_selected()); + LLAvatarActions::inviteToGroup(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9212,7 +9190,7 @@ class ListOfferTeleport : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::offerTeleport(get_focused_list_ids_selected()); + LLAvatarActions::offerTeleport(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9221,7 +9199,7 @@ class ListPay : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::pay(get_focused_list_id_selected()); + LLAvatarActions::pay(LFIDBearer::getActiveSelectedID()); return true; } }; @@ -9230,7 +9208,7 @@ class ListRemoveFriend : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::removeFriendDialog(get_focused_list_id_selected()); + LLAvatarActions::removeFriendDialog(LFIDBearer::getActiveSelectedID()); return true; } }; @@ -9239,7 +9217,7 @@ class ListRequestFriendship : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::requestFriendshipDialog(get_focused_list_id_selected()); + LLAvatarActions::requestFriendshipDialog(LFIDBearer::getActiveSelectedID()); return true; } }; @@ -9248,7 +9226,7 @@ class ListRequestTeleport : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::teleportRequest(get_focused_list_id_selected()); + LLAvatarActions::teleportRequest(LFIDBearer::getActiveSelectedID()); return true; } }; @@ -9257,7 +9235,7 @@ class ListShare : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::share(get_focused_list_id_selected()); + LLAvatarActions::share(LFIDBearer::getActiveSelectedID()); return true; } }; @@ -9272,7 +9250,7 @@ class ListShowLog : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - for (const LLUUID& id : get_focused_list_ids_selected()) + for (const LLUUID& id : LFIDBearer::getActiveSelectedIDs()) show_log_browser(id); return true; } @@ -9282,7 +9260,7 @@ class ListShowProfile : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::showProfiles(get_focused_list_ids_selected()); + LLAvatarActions::showProfiles(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9291,7 +9269,7 @@ class ListShowWebProfile : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::showProfiles(get_focused_list_ids_selected(), true); + LLAvatarActions::showProfiles(LFIDBearer::getActiveSelectedIDs(), true); return true; } }; @@ -9300,7 +9278,7 @@ class ListStartAdhocCall : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::startAdhocCall(get_focused_list_ids_selected()); + LLAvatarActions::startAdhocCall(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9309,7 +9287,7 @@ class ListStartCall : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::startCall(get_focused_list_id_selected()); + LLAvatarActions::startCall(LFIDBearer::getActiveSelectedID()); return true; } }; @@ -9318,7 +9296,7 @@ class ListStartConference : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::startConference(get_focused_list_ids_selected()); + LLAvatarActions::startConference(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9327,7 +9305,7 @@ class ListStartIM : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLAvatarActions::startIM(get_focused_list_id_selected()); + LLAvatarActions::startIM(LFIDBearer::getActiveSelectedID()); return true; } }; @@ -9336,7 +9314,7 @@ class ListAbuseReport : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLFloaterReporter::showFromObject(get_focused_list_id_selected()); + LLFloaterReporter::showFromObject(LFIDBearer::getActiveSelectedID()); return true; } }; @@ -9364,7 +9342,7 @@ class ListIsNearby : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - gMenuHolder->findControl(userdata["control"].asString())->setValue(is_nearby(get_focused_list_id_selected())); + gMenuHolder->findControl(userdata["control"].asString())->setValue(is_nearby(LFIDBearer::getActiveSelectedID())); return true; } }; @@ -9374,7 +9352,7 @@ class ListTrack : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - track_av(get_focused_list_id_selected()); + track_av(LFIDBearer::getActiveSelectedID()); return true; } }; @@ -9388,7 +9366,7 @@ class ListEject : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - confirm_eject(get_focused_list_ids_selected()); + confirm_eject(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9402,7 +9380,7 @@ class ListFreeze : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - confirm_freeze(get_focused_list_ids_selected()); + confirm_freeze(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9441,7 +9419,7 @@ class ListEstateBan : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - confirm_estate_ban(get_focused_list_ids_selected()); + confirm_estate_ban(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9454,7 +9432,7 @@ class ListEstateEject : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - confirm_estate_kick(get_focused_list_ids_selected()); + confirm_estate_kick(LFIDBearer::getActiveSelectedIDs()); return true; } }; @@ -9463,9 +9441,9 @@ class ListToggleMute : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - const uuid_vec_t& ids = get_focused_list_ids_selected(); - for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it) - LLAvatarActions::toggleBlock(*it); + const uuid_vec_t& ids = LFIDBearer::getActiveSelectedIDs(); + for (const auto& id : ids) + LLAvatarActions::toggleBlock(id); return true; } }; diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index b3f2cda7b..29d46def8 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -142,8 +142,6 @@ bool handle_go_to(); // Export to XML or Collada void handle_export_selected( void * ); -const LLUUID get_focused_list_id_selected(); - class LLViewerMenuHolderGL : public LLMenuHolderGL { public: From 99facf6764776b7a7d12b1ad8b03b9e559f35b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Mon, 7 Oct 2019 23:47:35 -0400 Subject: [PATCH 04/66] Make namebox an IDBearer, so now it has a right click menu, yay! --- indra/newview/llnamebox.cpp | 13 +++++++++++++ indra/newview/llnamebox.h | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp index 1814e7e59..39c83202f 100644 --- a/indra/newview/llnamebox.cpp +++ b/indra/newview/llnamebox.cpp @@ -109,6 +109,19 @@ void LLNameBox::showProfile() LLAvatarActions::showProfile(mNameID); } +// virtual +BOOL LLNameBox::handleRightMouseDown(S32 x, S32 y, MASK mask) +{ + if (!LLTextBox::handleRightMouseDown(x, y, mask)) + { + // Singu TODO: Generic menus for groups + if (mIsGroup || mNameID.isNull()) return FALSE; + + showMenu(this, sMenus[0], x, y); + } + return TRUE; +} + // virtual void LLNameBox::initFromXML(LLXMLNodePtr node, LLView* parent) { diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h index ad2b268d9..87ab8518e 100644 --- a/indra/newview/llnamebox.h +++ b/indra/newview/llnamebox.h @@ -35,6 +35,7 @@ #include +#include "lfidbearer.h" #include "llview.h" #include "llstring.h" #include "llfontgl.h" @@ -42,12 +43,16 @@ class LLNameBox : public LLTextBox +, public LFIDBearer { public: virtual void initFromXML(LLXMLNodePtr node, LLView* parent); static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); virtual ~LLNameBox(); + LLUUID getStringUUIDSelectedItem() const override final { return mNameID; } + uuid_vec_t getSelectedIDs() const override final { return {mNameID}; } + S32 getNumSelected() const override final { return 1; } void setNameID(const LLUUID& name_id, BOOL is_group); @@ -56,6 +61,7 @@ public: static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group); void showProfile(); + BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override final; protected: LLNameBox(const std::string& name); From 65ee3a53455d9dfd45b4f83cad284696e45cb3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Tue, 8 Oct 2019 15:55:06 -0400 Subject: [PATCH 05/66] Move duplicated logic out of NameBox and into new base class LLNameUI Also clean up includes. --- indra/newview/CMakeLists.txt | 2 + indra/newview/llnamebox.cpp | 61 ++------------------------ indra/newview/llnamebox.h | 26 ++--------- indra/newview/llnameui.cpp | 85 ++++++++++++++++++++++++++++++++++++ indra/newview/llnameui.h | 61 ++++++++++++++++++++++++++ indra/newview/llstartup.cpp | 4 +- 6 files changed, 157 insertions(+), 82 deletions(-) create mode 100644 indra/newview/llnameui.cpp create mode 100644 indra/newview/llnameui.h diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index ae9e02c43..e0ad1fe6d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -349,6 +349,7 @@ set(viewer_SOURCE_FILES llnamebox.cpp llnameeditor.cpp llnamelistctrl.cpp + llnameui.cpp llnetmap.cpp llnotify.cpp lloutfitobserver.cpp @@ -886,6 +887,7 @@ set(viewer_HEADER_FILES llnamebox.h llnameeditor.h llnamelistctrl.h + llnameui.h llnetmap.h llnotify.h lloutfitobserver.h diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp index 39c83202f..a94247609 100644 --- a/indra/newview/llnamebox.cpp +++ b/indra/newview/llnamebox.cpp @@ -35,70 +35,17 @@ #include "llnamebox.h" #include "llcachename.h" -#include "lltrans.h" #include "llavataractions.h" #include "llgroupactions.h" -// statics -std::set LLNameBox::sInstances; - static LLRegisterWidget r("name_box"); LLNameBox::LLNameBox(const std::string& name) -: LLTextBox(name, LLRect(), LLStringUtil::null, nullptr, TRUE) -, mInitialValue(LLTrans::getString("LoadingData")) +: LLNameUI() +, LLTextBox(name, LLRect(), LLStringUtil::null, nullptr, TRUE) { - sInstances.insert(this); - setText(LLStringUtil::null); -} - -LLNameBox::~LLNameBox() -{ - sInstances.erase(this); -} - -void LLNameBox::setNameID(const LLUUID& name_id, BOOL is_group) -{ - mNameID = name_id; - - std::string name; - BOOL got_name = FALSE; - - if (!is_group) - { - got_name = gCacheName->getFullName(name_id, name); - } - else - { - got_name = gCacheName->getGroupName(name_id, name); - } - - // At this point, if no callback has been set, set one - if (!mClickedCallback) - setClickedCallback(boost::bind(&LLNameBox::showProfile, this)); - - mIsGroup = is_group; - - // Got the name already? Set it. - // Otherwise it will be set later in refresh(). - setText(got_name ? name : mInitialValue); -} - -void LLNameBox::refresh(const LLUUID& id, const std::string& full_name, bool is_group) -{ - if (id == mNameID) - { - setText(full_name); - } -} - -void LLNameBox::refreshAll(const LLUUID& id, const std::string& full_name, bool is_group) -{ - for (auto& box : sInstances) - { - box->refresh(id, full_name, is_group); - } + setClickedCallback(boost::bind(&LLNameBox::showProfile, this)); } void LLNameBox::showProfile() @@ -127,6 +74,7 @@ void LLNameBox::initFromXML(LLXMLNodePtr node, LLView* parent) { LLTextBox::initFromXML(node, parent); node->getAttributeString("initial_value", mInitialValue); + setText(mInitialValue); } // static @@ -136,4 +84,3 @@ LLView* LLNameBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f name_box->initFromXML(node,parent); return name_box; } - diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h index 87ab8518e..a7b10e167 100644 --- a/indra/newview/llnamebox.h +++ b/indra/newview/llnamebox.h @@ -33,32 +33,18 @@ #ifndef LL_LLNAMEBOX_H #define LL_LLNAMEBOX_H -#include - -#include "lfidbearer.h" -#include "llview.h" -#include "llstring.h" -#include "llfontgl.h" +#include "llnameui.h" #include "lltextbox.h" class LLNameBox : public LLTextBox -, public LFIDBearer +, public LLNameUI { public: virtual void initFromXML(LLXMLNodePtr node, LLView* parent); static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); - virtual ~LLNameBox(); - LLUUID getStringUUIDSelectedItem() const override final { return mNameID; } - uuid_vec_t getSelectedIDs() const override final { return {mNameID}; } - S32 getNumSelected() const override final { return 1; } - - void setNameID(const LLUUID& name_id, BOOL is_group); - - void refresh(const LLUUID& id, const std::string& full_name, bool is_group); - - static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group); + void setText(const std::string& text) override final { LLTextBox::setText(text); } void showProfile(); BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override final; @@ -67,12 +53,6 @@ protected: LLNameBox(const std::string& name); friend class LLUICtrlFactory; -private: - static std::set sInstances; - - LLUUID mNameID; - bool mIsGroup; - std::string mInitialValue; }; #endif diff --git a/indra/newview/llnameui.cpp b/indra/newview/llnameui.cpp new file mode 100644 index 000000000..b0426c684 --- /dev/null +++ b/indra/newview/llnameui.cpp @@ -0,0 +1,85 @@ +/** + * @file llnameui.cpp + * @brief Name UI refreshes a name and bears a menu for interacting with it + * + * $LicenseInfo:firstyear=2003&license=viewergpl$ + * + * Copyright (c) 2003-2009, Linden Research, Inc. 2019, Liru Frs + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "llnameui.h" +#include "lltrans.h" + +// statics +std::set LLNameUI::sInstances; + +LLNameUI::LLNameUI(const std::string& loading, const LLUUID& id, bool is_group) + : mInitialValue(!loading.empty() ? loading : LLTrans::getString("LoadingData")) + , mNameID(id), mIsGroup(is_group) +{ + sInstances.insert(this); +} + +void LLNameUI::setNameID(const LLUUID& name_id, bool is_group) +{ + mNameID = name_id; + + std::string name; + bool got_name = false; + + if (!is_group) + { + got_name = gCacheName->getFullName(name_id, name); + } + else + { + got_name = gCacheName->getGroupName(name_id, name); + } + + mIsGroup = is_group; + + // Got the name already? Set it. + // Otherwise it will be set later in refresh(). + setText(got_name ? name : mInitialValue); +} + +void LLNameUI::refresh(const LLUUID& id, const std::string& full_name, bool is_group) +{ + if (id == mNameID) + { + setText(full_name); + } +} + +void LLNameUI::refreshAll(const LLUUID& id, const std::string& full_name, bool is_group) +{ + for (auto box : sInstances) + { + box->refresh(id, full_name, is_group); + } +} \ No newline at end of file diff --git a/indra/newview/llnameui.h b/indra/newview/llnameui.h new file mode 100644 index 000000000..50d621032 --- /dev/null +++ b/indra/newview/llnameui.h @@ -0,0 +1,61 @@ +/** + * @file llnameui.h + * @brief display and refresh a name from the name cache + * + * $LicenseInfo:firstyear=2003&license=viewergpl$ + * + * Copyright (c) 2003-2009, Linden Research, Inc. 2019, Liru Frs + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#pragma once + +#include + +#include "lfidbearer.h" + +struct LLNameUI : public LFIDBearer +{ + LLNameUI(const std::string& loading = LLStringUtil::null, const LLUUID& id = LLUUID::null, bool is_group = false); + virtual ~LLNameUI() { sInstances.erase(this); } + + LLUUID getStringUUIDSelectedItem() const override final { return mNameID; } + uuid_vec_t getSelectedIDs() const override final { return { mNameID }; } + S32 getNumSelected() const override final { return 1; } + + void setNameID(const LLUUID& name_id, bool is_group); + void refresh(const LLUUID& id, const std::string& full_name, bool is_group); + static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group); + + virtual void setText(const std::string& text) = 0; + +private: + static std::set sInstances; + +protected: + LLUUID mNameID; + bool mIsGroup; + std::string mInitialValue; +}; \ No newline at end of file diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 462302873..8c401241d 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -204,7 +204,7 @@ #include "llweb.h" #include "llvoiceclient.h" #include "llnamelistctrl.h" -#include "llnamebox.h" +#include "llnameui.h" #include "llnameeditor.h" #include "llwlparammanager.h" #include "llwaterparammanager.h" @@ -320,7 +320,7 @@ void transition_back_to_login_panel(const std::string& emsg); void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is_group) { - LLNameBox::refreshAll(id, full_name, is_group); + LLNameUI::refreshAll(id, full_name, is_group); LLNameEditor::refreshAll(id, full_name, is_group); // TODO: Actually be intelligent about the refresh. From bce8a3b3cc68d28d7791dd40ee8c76cf2313b190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 15:36:36 -0400 Subject: [PATCH 06/66] Add extending existing xml menus by using filename attribute --- indra/llui/llmenugl.cpp | 86 ++++++++++++++++++++-------------- indra/llui/llmenugl.h | 7 ++- indra/llui/lluictrlfactory.cpp | 10 ++-- 3 files changed, 61 insertions(+), 42 deletions(-) diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 6f3006dd7..5ae3d36b2 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -2109,13 +2109,13 @@ LLXMLNodePtr LLMenuGL::getXML(bool save_children) const return node; } -void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory *factory) +void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent) { std::string name(child->getName()->mString); if (child->hasName(LL_MENU_GL_TAG)) { // SUBMENU - LLMenuGL *submenu = (LLMenuGL*)LLMenuGL::fromXML(child, parent, factory); + LLMenuGL *submenu = (LLMenuGL*)LLMenuGL::fromXML(child, parent, LLUICtrlFactory::getInstance()); appendMenu(submenu); if (LLMenuGL::sMenuContainer != NULL) { @@ -2193,7 +2193,7 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory { mask |= MASK_SHIFT; } - S32 pipe_pos = shortcut.rfind("|"); + S32 pipe_pos = shortcut.rfind('|'); std::string key_str = shortcut.substr(pipe_pos+1); KEY key = KEY_NONE; @@ -2471,63 +2471,80 @@ BOOL LLMenuGL::isOpen() } } // static -LLView* LLMenuGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory) +LLView* LLMenuGL::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory* factory) { std::string name("menu"); node->getAttributeString("name", name); - std::string label = name; - node->getAttributeString("label", label); + LLMenuGL* menu = new LLMenuGL(name); - LLStringUtil::format(label, LLTrans::getDefaultArgs()); - - // parse jump key out of label - std::string new_menu_label; - - typedef boost::tokenizer > tokenizer; - boost::char_separator sep("_"); - tokenizer tokens(label, sep); - tokenizer::iterator token_iter; - - KEY jump_key = KEY_NONE; - S32 token_count = 0; - for( token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter) + // Menus can be extended using filename + if (node->hasAttribute("filename")) { - new_menu_label += (*token_iter); - if (token_count > 0) + std::string filename; + node->getAttributeString("filename", filename); + LLXMLNodePtr root; + LLUICtrlFactory::getLayeredXMLNode(filename, root); + menu->initMenuXML(root, parent); + } + menu->initMenuXML(node, parent); + + return menu; +} + +void LLMenuGL::initMenuXML(LLXMLNodePtr node, LLView* parent) +{ + std::string label; + if (node->getAttributeString("label", label)) + { + LLStringUtil::format(label, LLTrans::getDefaultArgs()); + + // parse jump key out of label + std::string new_menu_label; + + typedef boost::tokenizer> tokenizer; + boost::char_separator sep("_"); + + KEY jump_key = KEY_NONE; + S32 token_count = 0; + for (auto token : tokenizer(label, sep)) { - jump_key = (*token_iter).c_str()[0]; + new_menu_label += token; + if (token_count > 0) + { + jump_key = token.front(); + } + ++token_count; } - ++token_count; + + setLabel(new_menu_label); + setJumpKey(jump_key); } BOOL opaque = TRUE; node->getAttributeBOOL("opaque", opaque); - LLMenuGL *menu = new LLMenuGL(name, new_menu_label); - bool b(false); node->getAttribute_bool("scrollable", b); - menu->setScrollable(b); + setScrollable(b); - menu->setJumpKey(jump_key); BOOL tear_off = FALSE; node->getAttributeBOOL("tear_off", tear_off); - menu->setCanTearOff(tear_off); + setCanTearOff(tear_off); if (node->hasAttribute("drop_shadow")) { BOOL drop_shadow = FALSE; node->getAttributeBOOL("drop_shadow", drop_shadow); - menu->setDropShadowed(drop_shadow); + setDropShadowed(drop_shadow); } - menu->setBackgroundVisible(opaque); + setBackgroundVisible(opaque); LLColor4 color(0,0,0,1); if (opaque && LLUICtrlFactory::getAttributeColor(node,"color", color)) { - menu->setBackgroundColor(color); + setBackgroundColor(color); } BOOL create_jump_keys = FALSE; @@ -2536,14 +2553,13 @@ LLView* LLMenuGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa LLXMLNodePtr child; for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling()) { - menu->parseChildXML(child, parent, factory); + parseChildXML(child, parent); } if (create_jump_keys) { - menu->createJumpKeys(); + createJumpKeys(); } - return menu; } @@ -4776,7 +4792,7 @@ void LLContextMenu::initXML(LLXMLNodePtr node, LLView *context, LLUICtrlFactory } else { - parseChildXML(child, context, factory); + parseChildXML(child, context); } } } diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 7c3626d35..153479852 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -458,8 +458,9 @@ public: virtual ~LLMenuGL( void ); virtual LLXMLNodePtr getXML(bool save_children = true) const; static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); + void initMenuXML(LLXMLNodePtr node, LLView* parent); - void parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory *factory); + void parseChildXML(LLXMLNodePtr child, LLView *parent); // LLView Functionality /*virtual*/ BOOL handleUnicodeCharHere( llwchar uni_char ); @@ -580,15 +581,17 @@ public: void resetScrollPositionOnShow(bool reset_scroll_pos) { mResetScrollPositionOnShow = reset_scroll_pos; } bool isScrollPositionOnShowReset() { return mResetScrollPositionOnShow; } protected: - friend class LLTextEditor; void createSpilloverBranch(); void cleanupSpilloverBranch(); + +public: // Add the menu item to this menu. virtual BOOL append( LLMenuItemGL* item ); // add a menu - this will create a cascading menu virtual BOOL appendMenu( LLMenuGL* menu ); +protected: // TODO: create accessor methods for these? typedef std::list< LLMenuItemGL* > item_list_t; item_list_t mItems; diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp index e41a8082a..d753b40e1 100644 --- a/indra/llui/lluictrlfactory.cpp +++ b/indra/llui/lluictrlfactory.cpp @@ -406,16 +406,16 @@ LLMenuGL *LLUICtrlFactory::buildMenu(const std::string &filename, LLView* parent LLXMLNodePtr root; LLMenuGL* menu; - if (!LLUICtrlFactory::getLayeredXMLNode(filename, root)) + if (!getLayeredXMLNode(filename, root)) { - return NULL; + return nullptr; } // root must be called panel - if( !root->hasName( "menu_bar" ) && !root->hasName( "menu" ) && !root->hasName("context_menu")) + if (!root->hasName("menu_bar") && !root->hasName("menu") && !root->hasName("context_menu")) { - LL_WARNS() << "Root node should be named menu bar or menu in : " << filename << LL_ENDL; - return NULL; + LL_WARNS() << "Root node should be named menu bar or menu in: " << filename << LL_ENDL; + return nullptr; } if (root->hasName("menu") || root->hasName("context_menu")) From 3cb831bb565d45768deab82426071052ae1afb26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 15:52:12 -0400 Subject: [PATCH 07/66] Add the Photo Tools Windlights from FS, thanks FS/original authors --- .../Phototools%2D%20Absinthe%20Light%20.xml | 141 ++++++++++++++++++ .../skies/Phototools%2D%20Andi%20Light%20.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Angles%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%20%2008.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2002.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2003.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2004.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2005.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2006.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2007.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2008.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2009.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2010.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2011.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2012.xml | 141 ++++++++++++++++++ .../Phototools%2D%20B%2FW%20Light%2013.xml | 141 ++++++++++++++++++ ...otools%2D%20Boken%20Lines%20Light%2001.xml | 141 ++++++++++++++++++ ...ools%2D%20Breakwave%20Building%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Build%20002%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Build%20003%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Build%20005%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Build%20007%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Cafe%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Calima%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Charolotte%20Light.xml | 141 ++++++++++++++++++ ...Phototools%2D%20Cloud%20Credit%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Cloud%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Dead%20End%20Sky%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Dorm%20Light%2001.xml | 141 ++++++++++++++++++ ...totools%2D%20Dream%20Book%20Light%2001.xml | 141 ++++++++++++++++++ ...totools%2D%20Dream%20Book%20Light%2002.xml | 141 ++++++++++++++++++ ...totools%2D%20Dream%20Book%20Light%2003.xml | 141 ++++++++++++++++++ ...totools%2D%20Dream%20Book%20Light%2004.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Epi%20Vintage%20Light.xml | 141 ++++++++++++++++++ ...tools%2D%20Fashion%20Path%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Got%20It%20Light%20.xml | 141 ++++++++++++++++++ ...s%2D%20Horizon%20Building%20Light%2001.xml | 141 ++++++++++++++++++ ...s%2D%20Horizon%20Building%20Light%2002.xml | 141 ++++++++++++++++++ ...otools%2D%20Horizon%20Building%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Hospital%20Light%2001.xml | 141 ++++++++++++++++++ ...hototools%2D%20Hufflepuff%20Light%2001.xml | 141 ++++++++++++++++++ ...hototools%2D%20Hufflepuff%20Light%2002.xml | 141 ++++++++++++++++++ ...hototools%2D%20Hufflepuff%20Light%2003.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Jessica%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Jessica%20Light%2002.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Jessica%20Light%2003.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Jessica%20Light%2004.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Jim%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Jim%20Light%2002.xml | 141 ++++++++++++++++++ .../Phototools%2D%20July%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20July%20Light%2002.xml | 141 ++++++++++++++++++ .../Phototools%2D%20July%20Light%2003.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Landar%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Lo%20%20Gun%20Light.xml | 141 ++++++++++++++++++ .../skies/Phototools%2D%20Lo%20Light%2001.xml | 141 ++++++++++++++++++ .../skies/Phototools%2D%20Lo%20Light%2002.xml | 141 ++++++++++++++++++ .../skies/Phototools%2D%20Lo%20Light%2003.xml | 141 ++++++++++++++++++ .../skies/Phototools%2D%20Lo%20Light%2004.xml | 141 ++++++++++++++++++ .../skies/Phototools%2D%20Lo%20Light%2005.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Lo%20Moves%20Light.xml | 141 ++++++++++++++++++ ...hototools%2D%20Lo%20Music%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Mavi%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Mavi%20Light%2002.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Mavi%20Light%2003.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Me%20Love%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Me%20Mine%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Meni%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Miaa%20light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Moon%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Moon%20Light%2002.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Moon%20Light%2003.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Moon%20Light%2004.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Moon%20Light%2005.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Moon%20Light%2006.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Moon%20Light%2007.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Moon%20Light%2008.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Never%20Night%20Light.xml | 141 ++++++++++++++++++ .../skies/Phototools%2D%20No%20Light.xml | 141 ++++++++++++++++++ .../skies/Phototools%2D%20Owlery%20Light.xml | 141 ++++++++++++++++++ .../skies/Phototools%2D%20Puppy%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Queen%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Quidditch%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Save%20Me%20Light%20.xml | 141 ++++++++++++++++++ ...ototools%2D%20Shadow%20Testing%20Light.xml | 141 ++++++++++++++++++ .../skies/Phototools%2D%20Still%20Life.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Thalia%20Light%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Thalia%20Light%2002.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Trilogy%20Rain%2001.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Trilogy%20Rain%2002.xml | 141 ++++++++++++++++++ ...hototools%2D%20White%20Fire%20Sky%2001.xml | 141 ++++++++++++++++++ ...hototools%2D%20White%20Fire%20Sky%2002.xml | 141 ++++++++++++++++++ ...hototools%2D%20White%20Fire%20Sky%2003.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Yellow%20Stars%2001.xml | 141 ++++++++++++++++++ ...otools%2D%20rara%20Fall%20Home%20Light.xml | 141 ++++++++++++++++++ .../Phototools%2D%20Black%20Default%20.xml | 43 ++++++ ...ools%2D%20Breakwave%20Building%20Water.xml | 43 ++++++ .../water/Phototools%2D%20Chandra%20Sea.xml | 43 ++++++ .../Phototools%2D%20Gallery%20Water%2001.xml | 43 ++++++ .../water/Phototools%2D%20Ship%20Light.xml | 43 ++++++ 100 files changed, 13610 insertions(+) create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Absinthe%20Light%20.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Andi%20Light%20.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Angles%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%20%2008.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2003.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2004.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2005.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2006.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2007.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2008.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2009.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2010.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2011.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2012.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2013.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Boken%20Lines%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Breakwave%20Building%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20002%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20003%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20005%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20007%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Cafe%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Calima%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Charolotte%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Cloud%20Credit%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Cloud%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Dead%20End%20Sky%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Dorm%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2003.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2004.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Epi%20Vintage%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Fashion%20Path%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Got%20It%20Light%20.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Hospital%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2003.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2003.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2004.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Jim%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Jim%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2003.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Landar%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20%20Gun%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2003.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2004.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2005.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Moves%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Music%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2003.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Me%20Love%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Me%20Mine%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Meni%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Miaa%20light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2003.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2004.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2005.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2006.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2007.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2008.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Never%20Night%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20No%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Owlery%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Puppy%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Queen%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Quidditch%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Save%20Me%20Light%20.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Shadow%20Testing%20Light.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Still%20Life.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Thalia%20Light%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Thalia%20Light%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Trilogy%20Rain%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Trilogy%20Rain%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2002.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2003.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20Yellow%20Stars%2001.xml create mode 100644 indra/newview/app_settings/windlight/skies/Phototools%2D%20rara%20Fall%20Home%20Light.xml create mode 100644 indra/newview/app_settings/windlight/water/Phototools%2D%20Black%20Default%20.xml create mode 100644 indra/newview/app_settings/windlight/water/Phototools%2D%20Breakwave%20Building%20Water.xml create mode 100644 indra/newview/app_settings/windlight/water/Phototools%2D%20Chandra%20Sea.xml create mode 100644 indra/newview/app_settings/windlight/water/Phototools%2D%20Gallery%20Water%2001.xml create mode 100644 indra/newview/app_settings/windlight/water/Phototools%2D%20Ship%20Light.xml diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Absinthe%20Light%20.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Absinthe%20Light%20.xml new file mode 100644 index 000000000..31eb39ac2 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Absinthe%20Light%20.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.0799999237060547 + 0.98999994993209839 + 0.77999997138977051 + 1.0799999237060547 + + blue_density + + 0.64736837148666382 + 0.48414888978004456 + 0.81999999284744263 + 0.40999999642372131 + + blue_horizon + + 0.5 + 0.49548381567001343 + 0.45999997854232788 + 0.51999998092651367 + + cloud_color + + 0.4100000062111997 + 0.4100000062111997 + 0.4100000062111997 + 0.4100000062111997 + + cloud_pos_density1 + + 0.14000000059604645 + 0.62000000476837158 + 1 + 1 + + cloud_pos_density2 + + 0.35999998450279236 + 0.56999999284744263 + 0.12999999523162842 + 1 + + cloud_scale + + 0.35999998450279236 + 0 + 0 + 1.0000000149011612 + + cloud_scroll_rate + + 10.199999791580112 + 10.010999679880427 + + cloud_shadow + + 0.29999998211860657 + 0 + 0 + 1.0000000149011612 + + density_multiplier + + 7.9999997979030013e-005 + 0 + 0 + 1.0000000149011612 + + distance_multiplier + + 5.4000000953674316 + 0 + 0 + 1.0000000149011612 + + east_angle + 1.0932743549346924 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.1699998378753662 + 0 + 0 + 1.0000000149011612 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -0.55000001192092896 + 1 + + haze_density + + 0.31999999284744263 + 0 + 0 + 1 + + haze_horizon + + 0.17999999225139618 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.39627334475517273 + 0.89494067430496216 + -0.20505768060684204 + 0 + + max_y + + 805 + 0 + 0 + 1.0000000149011612 + + preset_num + 28 + star_brightness + 0.25999999046325684 + sun_angle + 2.0332944393157959 + sunlight_color + + 0.69882339239120483 + 0.8258824348449707 + 1.0799999237060547 + 0.35999998450279236 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Andi%20Light%20.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Andi%20Light%20.xml new file mode 100644 index 000000000..654652b52 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Andi%20Light%20.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 2 + 2 + 1 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0 + 0 + 0 + 0 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.99999994039535522 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 5.1599996368167922e-005 + 0 + 0 + 1 + + distance_multiplier + + 0.80000001192092896 + 0 + 0 + 1 + + east_angle + 3.091327428817749 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.69569998979568481 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.5 + 1 + + haze_density + + 3 + 0 + 0 + 1 + + haze_horizon + + 0.59999996423721313 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.0098020657896995544 + 0.9807855486869812 + 0.1948426365852356 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.7671445608139038 + sunlight_color + + 1.5 + 1.5 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Angles%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Angles%20Light%2001.xml new file mode 100644 index 000000000..fbb2272ff --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Angles%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.8235294818878174 + 1.2352941036224365 + 1.5411765575408936 + 0.60784316062927246 + + blue_density + + 1.2000000476837158 + 1.4039216041564941 + 1.6392157077789307 + 0.81960785388946533 + + blue_horizon + + 1.2000000476837158 + 1.4039216041564941 + 1.6392157077789307 + 0.81960785388946533 + + cloud_color + + 0 + 0 + 0 + 0 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.96579998731613159 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 1 + 0 + 0 + 1 + + density_multiplier + + 0.00020660000154748559 + 0 + 0 + 1 + + distance_multiplier + + 6.2000002861022949 + 0 + 0 + 1 + + east_angle + 0.29530972242355347 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.95649999380111694 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 2.059999942779541 + 0 + 0 + 1 + + haze_horizon + + 0.5 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.268882155418396 + 0.38268527388572693 + -0.88388597965240479 + 0 + + max_y + + 788 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 2.7488915920257568 + sunlight_color + + 1.5 + 1.5 + 1.5 + 0.5 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%20%2008.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%20%2008.xml new file mode 100644 index 000000000..268ea125f --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%20%2008.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 1 + 1 + 1 + 0.5 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.76829999685287476 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.059000000357627869 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00025079998886212707 + 0 + 0 + 1 + + distance_multiplier + + 14 + 0 + 0 + 1 + + east_angle + 0.19477875530719757 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 16.80000114440918 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.1499999761581421 + 0 + 0 + 1 + + haze_horizon + + 0.17000000178813934 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.14745019376277924 + 0.64778679609298706 + 0.74741601943969727 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 1.7856996059417725 + sun_angle + 0.70467567443847656 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2001.xml new file mode 100644 index 000000000..268ea125f --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 1 + 1 + 1 + 0.5 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.76829999685287476 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.059000000357627869 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00025079998886212707 + 0 + 0 + 1 + + distance_multiplier + + 14 + 0 + 0 + 1 + + east_angle + 0.19477875530719757 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 16.80000114440918 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.1499999761581421 + 0 + 0 + 1 + + haze_horizon + + 0.17000000178813934 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.14745019376277924 + 0.64778679609298706 + 0.74741601943969727 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 1.7856996059417725 + sun_angle + 0.70467567443847656 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2002.xml new file mode 100644 index 000000000..130571e2a --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 1 + 1 + 1 + 0.5 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.76829999685287476 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.059000000357627869 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00025079998886212707 + 0 + 0 + 1 + + distance_multiplier + + 14 + 0 + 0 + 1 + + east_angle + 0.19477875530719757 + enable_cloud_scroll + + 1 + 1 + + gamma + + 3.3912999629974365 + 0 + 0 + 1 + + glow + + 16.80000114440918 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.1499999761581421 + 0 + 0 + 1 + + haze_horizon + + 0.17000000178813934 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.14745019376277924 + 0.64778679609298706 + 0.74741601943969727 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 1.7856996059417725 + sun_angle + 0.70467567443847656 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2003.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2003.xml new file mode 100644 index 000000000..676f1a780 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2003.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.15000000596046448 + 0.15000000596046448 + 0.15000000596046448 + 0.05000000074505806 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + cloud_color + + 0 + 0 + 0 + 0 + + cloud_pos_density1 + + 0.93999999761581421 + 0.22999998927116394 + 0.38409999012947083 + 1 + + cloud_pos_density2 + + 1 + 0.50999999046325684 + 1 + 1 + + cloud_scale + + 0.31279999017715454 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0.43999999761581421 + 0 + 0 + 1 + + density_multiplier + + 7.3799994424916804e-005 + 0 + 0 + 1 + + distance_multiplier + + 13.199999809265137 + 0 + 0 + 1 + + east_angle + 1.9477875232696533 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1.3999999761581421 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.69999998807907104 + 0 + 0 + 1 + + haze_horizon + + 0.26999998092651367 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.51655691862106323 + 0.83146905899047852 + -0.20451940596103668 + 0 + + max_y + + 242 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.98174667358398438 + sunlight_color + + 2.6999998092651367 + 2.6999998092651367 + 2.6999998092651367 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2004.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2004.xml new file mode 100644 index 000000000..fa71d78f4 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2004.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 0.22615529217625469 + 0.22615529217625469 + 0.22615529217625469 + 0.99999702096404042 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.88000003558816353 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.0003761999832931906 + 0 + 0 + 1 + + distance_multiplier + + 31.80000114440918 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.3999996185302734 + 0.0010000000474974513 + -0.74999994039535522 + 1 + + haze_density + + 3.6292644654378239 + 0 + 0 + 1 + + haze_horizon + + 0.017144030545153739 + 0.19915600403562983 + 0.19915600403562983 + 1 + + lightnorm + + 0 + 0.29445916414260864 + -0.95566403865814209 + 0 + + max_y + + 869.42607640502217 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 1.7856996059417725 + sun_angle + 2.842703104019165 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2005.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2005.xml new file mode 100644 index 000000000..df9427703 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2005.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.1875 + 0.1875 + 0.1875 + 0.0625 + + blue_density + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + blue_horizon + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0.44999998807907104 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 21.700000762939453 + 0 + 0 + 1 + + east_angle + 1.9477875232696533 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3999999761581421 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.69999998807907104 + 0 + 0 + 1 + + haze_horizon + + 0.20999999344348907 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.51655691862106323 + 0.83146905899047852 + -0.20451940596103668 + 0 + + max_y + + 242 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.98174667358398438 + sunlight_color + + 2.6999998092651367 + 2.6999998092651367 + 2.6999998092651367 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2006.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2006.xml new file mode 100644 index 000000000..d0ba4bb02 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2006.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.1875 + 0.1875 + 0.1875 + 0.0625 + + blue_density + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + blue_horizon + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.99409997463226318 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.49579998850822449 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.70001220703125 + 10.01099967956543 + + cloud_shadow + + 0.29999998211860657 + 0 + 0 + 1 + + density_multiplier + + 0.00015750000602565706 + 0 + 0 + 1 + + distance_multiplier + + 4.5999999046325684 + 0 + 0 + 1 + + east_angle + 1.9477875232696533 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3999999761581421 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 1.7400000095367432 + 0 + 0 + 1 + + haze_horizon + + 0.070000000298023224 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.51655691862106323 + 0.83146905899047852 + -0.20451940596103668 + 0 + + max_y + + 11 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.98174667358398438 + sunlight_color + + 2.6999998092651367 + 2.6999998092651367 + 2.6999998092651367 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2007.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2007.xml new file mode 100644 index 000000000..f62fe8cd0 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2007.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.76829999685287476 + 1 + + cloud_pos_density2 + + 1 + 1 + 0 + 1 + + cloud_scale + + 0.00039999998989515007 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + 0.19999998807907104 + 0 + 0 + 1 + + density_multiplier + + 0.0010865998920053244 + 0 + 0 + 1 + + distance_multiplier + + 1000 + 0 + 0 + 1 + + east_angle + 1.5016813278198242 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.17999999225139618 + 0 + 0 + 1 + + glow + + 40 + 0.0010000000474974513 + -10 + 1 + + haze_density + + 5 + 0 + 0 + 1 + + haze_horizon + + 5 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.97396135330200195 + 0.21645671129226685 + -0.067422725260257721 + 0 + + max_y + + 2077 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.9234089851379395 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2008.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2008.xml new file mode 100644 index 000000000..4ecf8c2a6 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2008.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0.39999997615814209 + 0.39999997615814209 + 0.39999997615814209 + 0.19999998807907104 + + blue_horizon + + 1 + 1 + 1 + 0.5 + + cloud_color + + 0.22617273092134837 + 0.2261830306064212 + 0.22618354559006093 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.12499716758729562 + 1 + + cloud_scale + + 0.22999998927116394 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499370784775238 + 10.011009025563908 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00089999998454004526 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + 0 + 1 + + haze_density + + 0.5 + 0 + 0 + 1 + + haze_horizon + + 0.32999998331069946 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2009.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2009.xml new file mode 100644 index 000000000..1a9ebda49 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2009.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1.5 + 1.5 + 1.5 + 0.75 + + blue_horizon + + 1.5 + 1.5 + 1.5 + 0.75 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.95999997854232788 + 0.31000000238418579 + 0.34149998426437378 + 1 + + cloud_pos_density2 + + 1 + 1 + 0 + 1 + + cloud_scale + + 0.026399999856948853 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + 0.29999998211860657 + 0 + 0 + 1 + + density_multiplier + + 0.00018439999257680029 + 0 + 0 + 1 + + distance_multiplier + + 9.3000001907348633 + 0 + 0 + 1 + + east_angle + 0.78539818525314331 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 15.799999237060547 + 0.0010000000474974513 + -0.74999994039535522 + 1 + + haze_density + + 1.5299999713897705 + 0 + 0 + 1 + + haze_horizon + + 0.12999999523162842 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.64968371391296387 + 0.39474311470985413 + 0.64968371391296387 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 2 + sun_angle + 0.40578824281692505 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2010.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2010.xml new file mode 100644 index 000000000..0dac49355 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2010.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.76829999685287476 + 1 + + cloud_pos_density2 + + 1 + 1 + 0 + 1 + + cloud_scale + + 0.00039999998989515007 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + 0.18999999761581421 + 0 + 0 + 1 + + density_multiplier + + 0.001574800000526011 + 0 + 0 + 1 + + distance_multiplier + + 1083.300048828125 + 0 + 0 + 1 + + east_angle + 1.5016813278198242 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.20999999344348907 + 0 + 0 + 1 + + glow + + 100 + 0.0010000000474974513 + -25 + 1 + + haze_density + + 1.0070000886917114 + 0 + 0 + 1 + + haze_horizon + + 5.0410003662109375 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.97396135330200195 + 0.21645671129226685 + -0.067422725260257721 + 0 + + max_y + + 100000 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.9234089851379395 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2011.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2011.xml new file mode 100644 index 000000000..491a9eeb6 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2011.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00036219999310560524 + 0 + 0 + 1 + + distance_multiplier + + 9.3000001907348633 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.1599998474121094 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 1.3799999952316284 + 0 + 0 + 1 + + haze_horizon + + 0.11999999731779099 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 45 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2012.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2012.xml new file mode 100644 index 000000000..4e10ae8a9 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2012.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00074019999010488391 + 0 + 0 + 1 + + distance_multiplier + + 10.199999809265137 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 10 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -0.64999938011169434 + 1 + + haze_density + + 1.4499999284744263 + 0 + 0 + 1 + + haze_horizon + + 0.11999999731779099 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.81158280372619629 + -0.58423745632171631 + 0 + + max_y + + 1846 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 2.1947364807128906 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2013.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2013.xml new file mode 100644 index 000000000..655502438 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20B%2FW%20Light%2013.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 0 + 1 + + cloud_pos_density2 + + 1 + 1 + 0 + 1 + + cloud_scale + + 0 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + 0.1983799934387207 + 0 + 0 + 1 + + density_multiplier + + 0.00074799999129027128 + 0 + 0 + 1 + + distance_multiplier + + 163.80000305175781 + 0 + 0 + 1 + + east_angle + 1.5016813278198242 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.17999999225139618 + 0 + 0 + 1 + + glow + + 100 + 0.0010000000474974513 + -25 + 1 + + haze_density + + 0.33600002527236938 + 0 + 0 + 1 + + haze_horizon + + 5.0370001792907715 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.97396135330200195 + 0.21645671129226685 + -0.067422725260257721 + 0 + + max_y + + 100000 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.9234089851379395 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Boken%20Lines%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Boken%20Lines%20Light%2001.xml new file mode 100644 index 000000000..8b1a001b1 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Boken%20Lines%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 0 + 0 + 0 + 0 + + cloud_pos_density1 + + 0.5 + 0.5 + 0 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.34000000357627869 + 1 + + cloud_scale + + 0 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + -0.485443115234375 + 0 + 0 + 1 + + density_multiplier + + 3.9400001696776599e-005 + 0 + 0 + 1 + + distance_multiplier + + 10000 + 0 + 0 + 1 + + east_angle + 0.19477875530719757 + enable_cloud_scroll + + 0 + 0 + + gamma + + 9.25 + 0 + 0 + 1 + + glow + + 16.80000114440918 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.14745019376277924 + 0.64778679609298706 + 0.74741601943969727 + 0 + + max_y + + 4 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 0.70467567443847656 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Breakwave%20Building%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Breakwave%20Building%20Light.xml new file mode 100644 index 000000000..0fadd9c75 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Breakwave%20Building%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.37000000476837158 + 0.79999995231628418 + 0.12429999560117722 + 1 + + cloud_pos_density2 + + 0.97999995946884155 + 0.70999997854232788 + 0.049999997019767761 + 1 + + cloud_scale + + 0.17359998822212219 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0.47300004959106445 + 0 + 0 + 1 + + density_multiplier + + 9.4499999249819666e-005 + 0 + 0 + 1 + + distance_multiplier + + 39.400001525878906 + 0 + 0 + 1 + + east_angle + 5.4852209091186523 + enable_cloud_scroll + + 0 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.070000000298023224 + 0 + 0 + 1 + + haze_horizon + + 0.17999999225139618 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.47905999422073364 + 0.74313849210739136 + 0.46716883778572083 + 0 + + max_y + + 3615 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.83774858713150024 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20002%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20002%20Light.xml new file mode 100644 index 000000000..de207f503 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20002%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.15000000596046448 + 0.15000000596046448 + 0.15000000596046448 + 0.05000000074505806 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.75 + 0.75 + 0.75 + 0.75 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 3.0473451614379883 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.4199999570846558 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + 2.4000000953674316 + 1 + + haze_density + + 5 + 0 + 0 + 1 + + haze_horizon + + 5 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.083091713488101959 + 0.46948650479316711 + 0.87902116775512695 + 0 + + max_y + + 6538 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 500 + sun_angle + 2.6528835296630859 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20003%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20003%20Light.xml new file mode 100644 index 000000000..5f4bc38dd --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20003%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 0.45819997787475586 + 0.51910001039505005 + 0.70179998874664307 + 0.35089999437332153 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.78999996185302734 + 0.85999995470046997 + 0.76330000162124634 + 1 + + cloud_pos_density2 + + 0.97999995946884155 + 0.70999997854232788 + 0 + 1 + + cloud_scale + + 0.39659997820854187 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0.43999999761581421 + 0 + 0 + 1 + + density_multiplier + + 9.4499999249819666e-005 + 0 + 0 + 1 + + distance_multiplier + + 39.400001525878906 + 0 + 0 + 1 + + east_angle + 2.670353889465332 + enable_cloud_scroll + + 0 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.070000000298023224 + 0 + 0 + 1 + + haze_horizon + + 0.17999999225139618 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.30378204584121704 + 0.74313849210739136 + -0.59620606899261475 + 0 + + max_y + + 3615 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.83774858713150024 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20005%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20005%20Light.xml new file mode 100644 index 000000000..7d1102346 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20005%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.2899999618530273 + 1.2899999618530273 + 1.2899999618530273 + 0.43000000715255737 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.75 + 0.75 + 0.75 + 0.75 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 0.60946899652481079 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + 2.4000000953674316 + 1 + + haze_density + + 5 + 0 + 0 + 1 + + haze_horizon + + 5 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.36985558271408081 + 0.76324218511581421 + -0.5297812819480896 + 0 + + max_y + + 6538 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 500 + sun_angle + 2.2732763290405273 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20007%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20007%20Light.xml new file mode 100644 index 000000000..06034997f --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Build%20007%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.17999999225139618 + 0.17999999225139618 + 0.17999999225139618 + 0.059999998658895493 + + blue_density + + 1.5 + 1.5 + 1.5 + 0.75 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0 + 0 + 0 + 0 + + cloud_pos_density1 + + 0.93999999761581421 + 0.22999998927116394 + 0.38409999012947083 + 1 + + cloud_pos_density2 + + 1 + 0.50999999046325684 + 1 + 1 + + cloud_scale + + 0.31279999017715454 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 4.3416814804077148 + enable_cloud_scroll + + 0 + 0 + + gamma + + 2.6099998950958252 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.6760907769203186 + 0.68836575746536255 + 0.26278114318847656 + 0 + + max_y + + 242 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 2.3823590278625488 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Cafe%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Cafe%20Light%2001.xml new file mode 100644 index 000000000..7c10c0df4 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Cafe%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0.12089811412885521 + 0.33770671695460663 + 0.67541757891583387 + 0.76708334654569654 + + blue_horizon + + 0.13497034943045882 + 0.26690842067701936 + 0.4016666400432598 + 0.74541666984558219 + + cloud_color + + 0.625 + 0.625 + 0.875 + 0.875 + + cloud_pos_density1 + + 0.47999998927116394 + 0.97999995946884155 + 0.14630000293254852 + 1 + + cloud_pos_density2 + + 1 + 1 + 0.070000000298023224 + 1 + + cloud_scale + + 0.22280000150203705 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0.5 + 0 + 0 + 1 + + density_multiplier + + 0.00028125001798306321 + 0 + 0 + 1 + + distance_multiplier + + 6.3874998847643383 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0900000333786011 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.51583333298563971 + 0 + 0 + 1 + + haze_horizon + + 0.13833333183079954 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.28709480166435242 + 0.6259227991104126 + -0.72511875629425049 + 0 + + max_y + + 685.18749099969864 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 2 + sun_angle + 0.67631423473358154 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Calima%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Calima%20Light%2001.xml new file mode 100644 index 000000000..8cdc45ec0 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Calima%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.21000000834465027 + 0.21000000834465027 + 0.21000000834465027 + 0.070000000298023224 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 0.28666070103645325 + 0.28666070103645325 + 0.28666070103645325 + 0.28666070103645325 + + cloud_pos_density1 + + 0.17999999225139618 + 0.50999999046325684 + 0.91949393667753065 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 1.437999963760376 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.400862650389627 + 10.01099967956543 + + cloud_shadow + + -0.27299976348876953 + 0 + 0 + 1 + + density_multiplier + + 0.011666699312627316 + 0 + 0 + 1 + + distance_multiplier + + 0.10000000149011612 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 10 + 0 + 0 + 1 + + glow + + 22.000003814697266 + 0.0010000000474974513 + -7.5 + 1 + + haze_density + + 0.33600002527236938 + 0 + 0 + 1 + + haze_horizon + + 11.530000686645508 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.35022372007369995 + -0.93666607141494751 + 0 + + max_y + + 0 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 2.7837827205657959 + sunlight_color + + 0.32999998331069946 + 0.32999998331069946 + 0.32999998331069946 + 0.10999999940395355 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Charolotte%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Charolotte%20Light.xml new file mode 100644 index 000000000..623c258f5 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Charolotte%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.0006399999838322401 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 2.6515045166015625 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3042999505996704 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.5 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 1 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.063475340604782104 + 0.99086576700210571 + -0.11897877603769302 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.4355322122573853 + sunlight_color + + 3 + 0 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Cloud%20Credit%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Cloud%20Credit%20Light.xml new file mode 100644 index 000000000..baab0d39e --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Cloud%20Credit%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 3 + 3 + 3 + 1 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.95999997854232788 + 0.17999999225139618 + 0.12429999560117722 + 1 + + cloud_pos_density2 + + 1 + 0.5899999737739563 + 0 + 1 + + cloud_scale + + 0.074400000274181366 + 0 + 0 + 1 + + cloud_scroll_rate + + 76.100006103515625 + 10.70001220703125 + + cloud_shadow + + 0.29999998211860657 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 0 + 0 + + gamma + + 7.8399996757507324 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + 0.64999997615814209 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.8508676290512085 + -0.52538013458251953 + 0 + + max_y + + 0 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 2.1239581108093262 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Cloud%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Cloud%20Light%2001.xml new file mode 100644 index 000000000..d0456f444 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Cloud%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density1 + + 0.95999997854232788 + 0.31000000238418579 + 3 + 1 + + cloud_pos_density2 + + 1 + 1 + 0.71999996900558472 + 1 + + cloud_scale + + 0.2231999933719635 + 0 + 0 + 1 + + cloud_scroll_rate + + 18.5 + -3 + + cloud_shadow + + 0.15999999642372131 + 0 + 0 + 1 + + density_multiplier + + 3.299999889350147e-006 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 3.1855752468109131 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 15.799999237060547 + 0.0010000000474974513 + -0.74999994039535522 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 4.8899998664855957 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.040397927165031433 + 0.39473667740821838 + -0.91790574789047241 + 0 + + max_y + + 385 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 500 + sun_angle + 0.40578123927116394 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dead%20End%20Sky%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dead%20End%20Sky%2001.xml new file mode 100644 index 000000000..53a9cad03 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dead%20End%20Sky%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.83636385202407837 + 1.0036364793777466 + 1.3799998760223389 + 0.45999997854232788 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 2 + 0 + 0 + 1 + + cloud_color + + 0 + 0 + 0 + 0 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999523162842 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.0099999997764825821 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.510000228881836 + 10.01099967956543 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00018999999156221747 + 0 + 0 + 1 + + distance_multiplier + + 56.700000762939453 + 0 + 0 + 1 + + east_angle + 4.7123889923095703 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.1499999761581421 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.11999999731779099 + 0 + 0 + 1 + + haze_horizon + + 0.25 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.98078560829162598 + 0.19508861005306244 + 1.1695751034324076e-008 + 1 + + max_y + + 906 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 2 + sun_angle + 3.3379404544830322 + sunlight_color + + 0.59999996423721313 + 0.59999996423721313 + 1.1399999856948853 + 1.1399999856948853 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dorm%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dorm%20Light%2001.xml new file mode 100644 index 000000000..f4a22b8a2 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dorm%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.26250001788139343 + 0.3031250536441803 + 0.75 + 0.25 + + blue_density + + 1 + 0.5 + 0 + 0.5 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.23999999463558197 + 0.4699999988079071 + 0.31999999284744263 + 0.4699999988079071 + + cloud_pos_density1 + + 0.48999997973442078 + 0.50999999046325684 + 0.74000000953674316 + 1 + + cloud_pos_density2 + + 0.44999998807907104 + 0.5 + 0.14000000059604645 + 1 + + cloud_scale + + 0.32999998331069946 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.37999999523162842 + 0 + 0 + 1 + + density_multiplier + + 7.3799994424916804e-005 + 0 + 0 + 1 + + distance_multiplier + + 41.100002288818359 + 0 + 0 + 1 + + east_angle + 2.4064600467681885 + enable_cloud_scroll + + 0 + 0 + + gamma + + 3.2173998355865479 + 0 + 0 + 1 + + glow + + 12 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.3500000238418579 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.67022424936294556 + 0.037081710994243622 + 0.74123167991638184 + 0 + + max_y + + 0 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.0099999904632568 + sun_angle + 3.1045024394989014 + sunlight_color + + 2.5799999237060547 + 2.4411697387695313 + 2.4411697387695313 + 0.86000001430511475 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2001.xml new file mode 100644 index 000000000..278ce095d --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.031499996781349182 + 0.15789999067783356 + 0.26850000023841858 + 0.089500002562999725 + + blue_density + + 0 + 1.3200000524520874 + 1.3199996948242188 + 0.6600000262260437 + + blue_horizon + + 0 + 0.79687511920928955 + 0.79687494039535522 + 0.39843755960464478 + + cloud_color + + 0.2481999397277832 + 0.60211998224258423 + 0.91180002689361572 + 0.91180002689361572 + + cloud_pos_density1 + + 0.69999998807907104 + 0.19999998807907104 + 1.2249000072479248 + 1 + + cloud_pos_density2 + + 0.70999997854232788 + 0.84999996423721313 + 0.35999998450279236 + 1 + + cloud_scale + + 0.29760000109672546 + 0 + 0 + 1 + + cloud_scroll_rate + + 11.70001220703125 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00014170000213198364 + 0 + 0 + 1 + + distance_multiplier + + 6.5 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 0 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 32.599998474121094 + 0.0010000000474974513 + -5.0500001907348633 + 1 + + haze_density + + 1.5999999046325684 + 0 + 0 + 1 + + haze_horizon + + 0.38999998569488525 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.8876205482883961e-007 + 1 + + max_y + + 2769 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 500 + sun_angle + 4.7123894691467285 + sunlight_color + + 0.34876692295074463 + 0.35574248433113098 + 0.65999996662139893 + 0.2199999988079071 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2002.xml new file mode 100644 index 000000000..d0ef3494c --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.99101096746882478 + 0.90569759047448506 + 0.94676920768410944 + 0.33033699762952112 + + blue_density + + 0.15949166061381881 + 0.44534921175553777 + 0.78703662568265287 + 0.78703662568265287 + + blue_horizon + + 0.45808683258190275 + 0.46276614028103857 + 0.64592672496531911 + 0.38195237578970165 + + cloud_color + + 0.33464740594394182 + 0.33464740594394182 + 0.33464740594394182 + 0.52483933184657472 + + cloud_pos_density1 + + 0.17999999225139618 + 0.50999999046325684 + 0.97050554401449818 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999997879515621 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.273588712934393 + 10.010999679568112 + + cloud_shadow + + 0.34000000357627869 + 0 + 0 + 1 + + density_multiplier + + 0.00028814651401716849 + 0 + 0 + 1 + + distance_multiplier + + 16.30000114440918 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.0002455048624084 + 0.001 + -0.4800002433233434 + 1 + + haze_density + + 0.6606740078475033 + 0 + 0 + 1 + + haze_horizon + + 0.18262636689842734 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.99904829263687134 + -0.043617993593215942 + 0 + + max_y + + 1348.8893615007401 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 1.6144281625747681 + sunlight_color + + 1.1362672142439687 + 1.1719930547447106 + 1.2613076522878659 + 0.42043587660352916 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2003.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2003.xml new file mode 100644 index 000000000..d484dbf8f --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2003.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.0298734564795637 + 0.88898782567135015 + 0.88898782567135015 + 0.79949215426478126 + + blue_density + + 0.17798297054824247 + 0.41603360580930904 + 0.78683667783050026 + 0.79594799064391797 + + blue_horizon + + 0.23530982264376704 + 0.30629670960041322 + 0.37835530224478614 + 0.77620100618916932 + + cloud_color + + 0.2866606875510479 + 0.2866606875510479 + 0.2866606875510479 + 0.80582145952723883 + + cloud_pos_density1 + + 0.17999999225139618 + 0.50999999046325684 + 0.91949393667753065 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998688697698 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.400862650389627 + 10.01099967956543 + + cloud_shadow + + 0.34000000357627869 + 0 + 0 + 1 + + density_multiplier + + 0.00036784747657809082 + 0 + 0 + 1 + + distance_multiplier + + 0.93417677079577877 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.69999998807907104 + 0 + 0 + 1 + + haze_horizon + + 0.16987348178519687 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.30417308211326599 + -0.95261681079864502 + 0 + + max_y + + 905.60360267758369 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 2.8325223922729492 + sunlight_color + + 2.1459913660813905 + 2.1615810746477075 + 2.2005553460635001 + 0.76961867816836427 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2004.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2004.xml new file mode 100644 index 000000000..2de71161f --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Dream%20Book%20Light%2004.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.99101096746882478 + 0.90569759047448506 + 0.94676920768410944 + 0.33033699762952112 + + blue_density + + 0.15949166061381881 + 0.44534921175553777 + 0.78703662568265287 + 0.78703662568265287 + + blue_horizon + + 0.45808683258190275 + 0.46276614028103857 + 0.64592672496531911 + 0.38195237578970165 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.17999999225139618 + 0.50999999046325684 + 0.97050554401449818 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999997879515621 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.273588712934393 + 10.010999679568112 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00033999999868683517 + 0 + 0 + 1 + + distance_multiplier + + 31 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.0002455711364746 + 0.0010000000474974513 + -0.74999994039535522 + 1 + + haze_density + + 1.059999942779541 + 0 + 0 + 1 + + haze_horizon + + 0.42999997735023499 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.99904829263687134 + -0.043617993593215942 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 1.6144281625747681 + sunlight_color + + 1.1362672142439687 + 1.1719930547447106 + 1.2613076522878659 + 0.42043587660352916 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Epi%20Vintage%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Epi%20Vintage%20Light.xml new file mode 100644 index 000000000..1bb93ec23 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Epi%20Vintage%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.29999998211860657 + 0.17999999225139618 + 0 + 0.099999994039535522 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.31999999284744263 + 0.31999999284744263 + 0.15999999642372131 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00031000000308267772 + 0 + 0 + 1 + + distance_multiplier + + 40.299999237060547 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 2.2100000381469727 + 0 + 0 + 1 + + haze_horizon + + 0.56999999284744263 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.36227512359619141 + -0.93207120895385742 + 0 + + max_y + + 752 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7708849906921387 + sunlight_color + + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + 0.45999997854232788 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Fashion%20Path%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Fashion%20Path%20Light%2001.xml new file mode 100644 index 000000000..14d6ab9b3 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Fashion%20Path%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.5 + 1.5 + 3 + 1 + + blue_density + + 2 + 2 + 1 + 1 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.43948723673439005 + 0.49764935046544778 + 0.50246442938400904 + 1 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.18000000715255737 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00028125001798306321 + 0 + 0 + 1 + + distance_multiplier + + 62.700000762939453 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0900000333786011 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.42999997735023499 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.28709480166435242 + 0.6259227991104126 + -0.72511875629425049 + 0 + + max_y + + 0 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.67631423473358154 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Got%20It%20Light%20.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Got%20It%20Light%20.xml new file mode 100644 index 000000000..718bd1ab5 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Got%20It%20Light%20.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.56099998950958252 + 0.37620007991790771 + 0.099000021815299988 + 0.18699999153614044 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.31999999284744263 + 0.31999999284744263 + 0.15999999642372131 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12459999322891235 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.0004881999921053648 + 0 + 0 + 1 + + distance_multiplier + + 3.9000000953674316 + 0 + 0 + 1 + + east_angle + 2.2870795726776123 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3042999505996704 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -0.04999995231628418 + 1 + + haze_density + + 3.4800000190734863 + 0 + 0 + 1 + + haze_horizon + + 0.37000000476837158 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.70532232522964478 + 0.35430732369422913 + 0.61399251222610474 + 0 + + max_y + + 385 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7794194221496582 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light%2001.xml new file mode 100644 index 000000000..8b6adaae2 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1.7200000286102295 + 1.3424379825592041 + 0.83542799949645996 + 0.86000001430511475 + + blue_horizon + + 1.4582855701446533 + 1.3041387796401978 + 1.0971424579620361 + 0.72914278507232666 + + cloud_color + + 0 + 0.39843800663948059 + 0.39843699336051941 + 0.39843800663948059 + + cloud_pos_density1 + + 0.47999998927116394 + 0.87000000476837158 + 1.4378999471664429 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.87000000476837158 + 1 + + cloud_scale + + 0.37199997901916504 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0.55000001192092896 + 0 + 0 + 1 + + density_multiplier + + 0.00058270001318305731 + 0 + 0 + 1 + + distance_multiplier + + 63 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1.0900000333786011 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -10 + 1 + + haze_density + + 0.039999999105930328 + 0 + 0 + 1 + + haze_horizon + + 0.52999997138977051 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.28709480166435242 + 0.6259227991104126 + -0.72511875629425049 + 0 + + max_y + + 5615 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.67631423473358154 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light%2002.xml new file mode 100644 index 000000000..0fadd9c75 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.37000000476837158 + 0.79999995231628418 + 0.12429999560117722 + 1 + + cloud_pos_density2 + + 0.97999995946884155 + 0.70999997854232788 + 0.049999997019767761 + 1 + + cloud_scale + + 0.17359998822212219 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0.47300004959106445 + 0 + 0 + 1 + + density_multiplier + + 9.4499999249819666e-005 + 0 + 0 + 1 + + distance_multiplier + + 39.400001525878906 + 0 + 0 + 1 + + east_angle + 5.4852209091186523 + enable_cloud_scroll + + 0 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.070000000298023224 + 0 + 0 + 1 + + haze_horizon + + 0.17999999225139618 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.47905999422073364 + 0.74313849210739136 + 0.46716883778572083 + 0 + + max_y + + 3615 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.83774858713150024 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light.xml new file mode 100644 index 000000000..0fadd9c75 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Horizon%20Building%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.37000000476837158 + 0.79999995231628418 + 0.12429999560117722 + 1 + + cloud_pos_density2 + + 0.97999995946884155 + 0.70999997854232788 + 0.049999997019767761 + 1 + + cloud_scale + + 0.17359998822212219 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0.47300004959106445 + 0 + 0 + 1 + + density_multiplier + + 9.4499999249819666e-005 + 0 + 0 + 1 + + distance_multiplier + + 39.400001525878906 + 0 + 0 + 1 + + east_angle + 5.4852209091186523 + enable_cloud_scroll + + 0 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.070000000298023224 + 0 + 0 + 1 + + haze_horizon + + 0.17999999225139618 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.47905999422073364 + 0.74313849210739136 + 0.46716883778572083 + 0 + + max_y + + 3615 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.83774858713150024 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hospital%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hospital%20Light%2001.xml new file mode 100644 index 000000000..e615890c9 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hospital%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.84000003337860107 + 0.84000003337860107 + 0.84000003337860107 + 0.2800000011920929 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.17999999225139618 + 0.50999999046325684 + 0.97050554401449818 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999997879515621 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.273588712934393 + 10.010999679568112 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00017699999443721026 + 0 + 0 + 1 + + distance_multiplier + + 26.399999618530273 + 0 + 0 + 1 + + east_angle + 1.9163715839385986 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.0002455711364746 + 0.0010000000474974513 + -0.94999998807907104 + 1 + + haze_density + + 0.96999996900558472 + 0 + 0 + 1 + + haze_horizon + + 0.37999999523162842 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.88343405723571777 + 0.34407094120979309 + 0.3180558979511261 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 2.7903435230255127 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2001.xml new file mode 100644 index 000000000..c5b090d13 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.56250005960464478 + 0.26250001788139343 + 0.75 + 0.25 + + blue_density + + 0 + 0.40999585390090942 + 0.81999999284744263 + 0.85999995470046997 + + blue_horizon + + 0.43999999761581421 + 0.22910800576210022 + 0.26829266548156738 + 0.2199999988079071 + + cloud_color + + 0.23999999463558197 + 0.4699999988079071 + 0.31999999284744263 + 0.4699999988079071 + + cloud_pos_density1 + + 0.48999997973442078 + 0.50999999046325684 + 0.74000000953674316 + 1 + + cloud_pos_density2 + + 0.44999998807907104 + 0.5 + 0.14000000059604645 + 1 + + cloud_scale + + 0.32999998331069946 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.37999999523162842 + 0 + 0 + 1 + + density_multiplier + + 0.00035999997635371983 + 0 + 0 + 1 + + distance_multiplier + + 2 + 0 + 0 + 1 + + east_angle + 0.12566371262073517 + enable_cloud_scroll + + 0 + 0 + + gamma + + 2.0299999713897705 + 0 + 0 + 1 + + glow + + 12 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 0.77999997138977051 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.12524418532848358 + 0.037689968943595886 + -0.9914097785949707 + 0 + + max_y + + 591 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.0099999904632568 + sun_angle + 3.1038937568664551 + sunlight_color + + 2.5799999237060547 + 2.4411697387695313 + 2.4411697387695313 + 0.85999995470046997 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2002.xml new file mode 100644 index 000000000..aaff835eb --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.26250001788139343 + 0.3031250536441803 + 0.75 + 0.25 + + blue_density + + 1 + 0.5 + 0 + 0.5 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.23999999463558197 + 0.4699999988079071 + 0.31999999284744263 + 0.4699999988079071 + + cloud_pos_density1 + + 0.48999997973442078 + 0.50999999046325684 + 0.74000000953674316 + 1 + + cloud_pos_density2 + + 0.44999998807907104 + 0.5 + 0.14000000059604645 + 1 + + cloud_scale + + 0.32999998331069946 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.37999999523162842 + 0 + 0 + 1 + + density_multiplier + + 0.00031719999969936907 + 0 + 0 + 1 + + distance_multiplier + + 39.5 + 0 + 0 + 1 + + east_angle + 2.4064600467681885 + enable_cloud_scroll + + 0 + 0 + + gamma + + 2.4347999095916748 + 0 + 0 + 1 + + glow + + 12 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.559999942779541 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.67022424936294556 + 0.037081710994243622 + 0.74123167991638184 + 0 + + max_y + + 0 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.0099999904632568 + sun_angle + 3.1045024394989014 + sunlight_color + + 2.5799999237060547 + 2.4411697387695313 + 2.4411697387695313 + 0.86000001430511475 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2003.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2003.xml new file mode 100644 index 000000000..82c876696 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Hufflepuff%20Light%2003.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.56250005960464478 + 0.26250001788139343 + 0.75 + 0.25 + + blue_density + + 0 + 0.40999585390090942 + 0.81999999284744263 + 0.85999995470046997 + + blue_horizon + + 0.43999999761581421 + 0.22910800576210022 + 0.26829266548156738 + 0.2199999988079071 + + cloud_color + + 0.23999999463558197 + 0.4699999988079071 + 0.31999999284744263 + 0.4699999988079071 + + cloud_pos_density1 + + 0.48999997973442078 + 0.50999999046325684 + 0.74000000953674316 + 1 + + cloud_pos_density2 + + 0.44999998807907104 + 0.5 + 0.14000000059604645 + 1 + + cloud_scale + + 0.32999998331069946 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.37999999523162842 + 0 + 0 + 1 + + density_multiplier + + 0.00049000000581145287 + 0 + 0 + 1 + + distance_multiplier + + 35.700000762939453 + 0 + 0 + 1 + + east_angle + 0.12566371262073517 + enable_cloud_scroll + + 0 + 0 + + gamma + + 2.0299999713897705 + 0 + 0 + 1 + + glow + + 12 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.5899999141693115 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.12524418532848358 + 0.037689968943595886 + -0.9914097785949707 + 0 + + max_y + + 591 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.0099999904632568 + sun_angle + 3.1038937568664551 + sunlight_color + + 2.5799999237060547 + 2.4411697387695313 + 2.4411697387695313 + 0.85999995470046997 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2001.xml new file mode 100644 index 000000000..768f4f7a8 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.0499999523162842 + 1.0499999523162842 + 1.0499999523162842 + 0.34999999403953552 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0.6171875 + 0.6171875 + 0.6171875 + 0.30859375 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00017999998817685992 + 0 + 0 + 1 + + distance_multiplier + + 70.900001525878906 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.1999998092651367 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.69999998807907104 + 0 + 0 + 1 + + haze_horizon + + 0.18999999761581421 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 1605 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 0.7342105507850647 + 0.78157901763916016 + 0.90000003576278687 + 0.30000001192092896 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2002.xml new file mode 100644 index 000000000..c75320eea --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.0499999523162842 + 1.0499999523162842 + 1.0499999523162842 + 0.34999999403953552 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0.6171875 + 0.6171875 + 0.6171875 + 0.30859375 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00017999998817685992 + 0 + 0 + 1 + + distance_multiplier + + 70.599998474121094 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.1999998092651367 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.69999998807907104 + 0 + 0 + 1 + + haze_horizon + + 0.18999999761581421 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 2923 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 0.7342105507850647 + 0.78157901763916016 + 0.90000003576278687 + 0.30000001192092896 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2003.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2003.xml new file mode 100644 index 000000000..638439837 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2003.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.62999999523162842 + 0.62999999523162842 + 0.62999999523162842 + 0.20999999344348907 + + blue_density + + 1.5 + 1.5 + 1.5 + 0.75 + + blue_horizon + + 0.6171875 + 0.6171875 + 0.6171875 + 0.30859375 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00012599999899975955 + 0 + 0 + 1 + + distance_multiplier + + 70.599998474121094 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.1999998092651367 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.98999994993209839 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 2923 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2004.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2004.xml new file mode 100644 index 000000000..fcec7085f --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jessica%20Light%2004.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.62999999523162842 + 0.62999999523162842 + 0.62999999523162842 + 0.20999999344348907 + + blue_density + + 1.5 + 1.5 + 1.5 + 0.75 + + blue_horizon + + 0.6171875 + 0.6171875 + 0.6171875 + 0.30859375 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 4.7199999244185165e-005 + 0 + 0 + 1 + + distance_multiplier + + 70.900001525878906 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 27.200000762939453 + 0.0010000000474974513 + -7.3500003814697266 + 1 + + haze_density + + 1.1699999570846558 + 0 + 0 + 1 + + haze_horizon + + 0.81999999284744263 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 10000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jim%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jim%20Light%2001.xml new file mode 100644 index 000000000..57538798b --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jim%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.43948723673439005 + 0.49764935046544778 + 0.50246442938400904 + 1 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.18000000715255737 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00028125001798306321 + 0 + 0 + 1 + + distance_multiplier + + 6.3874998847643383 + 0 + 0 + 1 + + east_angle + 2.8274335861206055 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0900000333786011 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.51583333298563971 + 0 + 0 + 1 + + haze_horizon + + 0.13833333183079954 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.30801057815551758 + 0.080633237957954407 + -0.94795984029769897 + 0 + + max_y + + 685.18749099969864 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.080720871686935425 + sunlight_color + + 0 + 3 + 1.5 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jim%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jim%20Light%2002.xml new file mode 100644 index 000000000..11772b4f0 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Jim%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.43948723673439005 + 0.49764935046544778 + 0.50246442938400904 + 1 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.18000000715255737 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00028125001798306321 + 0 + 0 + 1 + + distance_multiplier + + 6.3874998847643383 + 0 + 0 + 1 + + east_angle + 2.6515045166015625 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.4347999095916748 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + -0 + 1 + + haze_density + + 0.51583333298563971 + 0 + 0 + 1 + + haze_horizon + + 0.13833333183079954 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.46225041151046753 + 0.18866632878780365 + -0.86644649505615234 + 0 + + max_y + + 685.18749099969864 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.18980391323566437 + sunlight_color + + 0 + 3 + 1.5 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2001.xml new file mode 100644 index 000000000..88205d15c --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.0448951721191406 + 1.0375124216079712 + 1.0410666465759277 + 0.34829840064048767 + + blue_density + + 0.15995600819587708 + 0.44843131303787231 + 0.76233971118927002 + 0.38116985559463501 + + blue_horizon + + 0.53291136026382446 + 0.47850862145423889 + 0.69532060623168945 + 0.34766030311584473 + + cloud_color + + 0.36694067716598511 + 0.36694067716598511 + 0.36694067716598511 + 0.36694067716598511 + + cloud_pos_density1 + + 0.59999996423721313 + 0.4699999988079071 + 0.99744760127569754 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999997638634312 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.206368064503224 + 10.010999679565662 + + cloud_shadow + + 0.48999997973442078 + 0 + 0 + 1 + + density_multiplier + + 0.00018935874525381486 + 0 + 0 + 1 + + distance_multiplier + + 0.84041139239945806 + 0 + 0 + 1 + + east_angle + 0.32672566175460815 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.0000211801171162 + 0.0010000000474974277 + -0.48000001234523038 + 1 + + haze_density + + 0.69659684739417083 + 0 + 0 + 1 + + haze_horizon + + 0.1893618953990921 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.27510377764701843 + 0.51503080129623413 + 0.81182581186294556 + 0 + + max_y + + 1582.8367459774017 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.54104357957839966 + sunlight_color + + 0.76900362968444824 + 0.8153645396232605 + 0.93126672506332397 + 0.31042224168777466 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2002.xml new file mode 100644 index 000000000..d385af566 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.45899999141693115 + 0.3078000545501709 + 0.081000030040740967 + 0.15299999713897705 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.31999999284744263 + 0.31999999284744263 + 0.15999999642372131 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12459999322891235 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00040939997415989637 + 0 + 0 + 1 + + distance_multiplier + + 3.9000000953674316 + 0 + 0 + 1 + + east_angle + 2.2870795726776123 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3042999505996704 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -0.04999995231628418 + 1 + + haze_density + + 2.869999885559082 + 0 + 0 + 1 + + haze_horizon + + 0.5 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.71421909332275391 + 0.32145592570304871 + 0.62173730134963989 + 0 + + max_y + + 385 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.8143260478973389 + sunlight_color + + 2.0099999904632568 + 2.0099999904632568 + 2.0099999904632568 + 0.67000001668930054 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2003.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2003.xml new file mode 100644 index 000000000..40ffdc4cd --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20July%20Light%2003.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.56099998950958252 + 0.37620007991790771 + 0.099000021815299988 + 0.18699999153614044 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.31999999284744263 + 0.31999999284744263 + 0.15999999642372131 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12459999322891235 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.0004881999921053648 + 0 + 0 + 1 + + distance_multiplier + + 3.9000000953674316 + 0 + 0 + 1 + + east_angle + 2.2556638717651367 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3042999505996704 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -0.04999995231628418 + 1 + + haze_density + + 3.4800000190734863 + 0 + 0 + 1 + + haze_horizon + + 0.37000000476837158 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.72426009178161621 + 0.35430732369422913 + 0.59153497219085693 + 0 + + max_y + + 385 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7794194221496582 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Landar%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Landar%20Light%2001.xml new file mode 100644 index 000000000..30cdcd0a5 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Landar%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1.5 + 1.5 + 1.5 + 0.75 + + blue_horizon + + 1 + 1 + 1 + 0.5 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.95999997854232788 + 0.31000000238418579 + 0.34149998426437378 + 1 + + cloud_pos_density2 + + 1 + 1 + 0 + 1 + + cloud_scale + + 0.049599997699260712 + 0 + 0 + 1 + + cloud_scroll_rate + + 93.100006103515625 + -25.899993896484375 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00018439999257680029 + 0 + 0 + 1 + + distance_multiplier + + 2.2000000476837158 + 0 + 0 + 1 + + east_angle + 3.1855752468109131 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 15.799999237060547 + 0.0010000000474974513 + -0.74999994039535522 + 1 + + haze_density + + 0.66999995708465576 + 0 + 0 + 1 + + haze_horizon + + 0.12999999523162842 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.040397927165031433 + 0.39473667740821838 + -0.91790574789047241 + 0 + + max_y + + 2231 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 500 + sun_angle + 0.40578123927116394 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20%20Gun%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20%20Gun%20Light.xml new file mode 100644 index 000000000..add735967 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20%20Gun%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.5 + 1.8999999761581421 + 3 + 1 + + blue_density + + 1.4579999446868896 + 0 + 0.82620006799697876 + 0.72899997234344482 + + blue_horizon + + 1.4579999446868896 + 0 + 0.7047005295753479 + 0.72899997234344482 + + cloud_color + + 0.37840613487830987 + 0.37840613487830987 + 0.37840613487830987 + 0.37840613487830987 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.99999998870089368 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999997841284203 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999837455794 + 10.01099967956543 + + cloud_shadow + + 0.48999997973442078 + 0 + 0 + 1 + + density_multiplier + + 3.6899997212458402e-005 + 0 + 0 + 1 + + distance_multiplier + + 75.200004577636719 + 0 + 0 + 1 + + east_angle + 6.2266373634338379 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0434999465942383 + 0 + 0 + 1 + + glow + + 4.9999999435054558 + 0.0010000000474974513 + -0.4799999902127477 + 1 + + haze_density + + 0.34999999403953552 + 0 + 0 + 1 + + haze_horizon + + 1 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.045796267688274384 + 0.58601820468902588 + 0.80900269746780396 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.62613606452941895 + sunlight_color + + 1.4099999666213989 + 1.4099999666213989 + 1.4099999666213989 + 0.4699999988079071 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2001.xml new file mode 100644 index 000000000..2a395d8bb --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.0006399999838322401 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 3.1415927410125732 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.0199999809265137 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.5 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 1 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 4.8569567923095747e-008 + 0.83146905899047852 + -0.55557107925415039 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.98174667358398438 + sunlight_color + + 1.5 + 1.5 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2002.xml new file mode 100644 index 000000000..dbb840506 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 3 + 3 + 3 + 1 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density1 + + 0.29999998211860657 + 0.93999999761581421 + 0.75 + 1 + + cloud_pos_density2 + + 0.44999998807907104 + 0.35999998450279236 + 0.019999999552965164 + 1 + + cloud_scale + + 0.45999997854232788 + 0 + 0 + 1 + + cloud_scroll_rate + + 20 + 20 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00089999998454004526 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 6.2831854820251465 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1.0099999904632568 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.5 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 1 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 6.3370464431500295e-008 + 0.93200832605361938 + -0.36243680119514465 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 24 + star_brightness + 2 + sun_angle + 1.941677451133728 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2003.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2003.xml new file mode 100644 index 000000000..3b32f8dcf --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2003.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.41796875 + 1.41796875 + 1.41796875 + 0.47265625 + + blue_density + + 0.12089811412885521 + 0.33770671695460663 + 0.67541757891583387 + 0.76708334654569654 + + blue_horizon + + 0.13497034943045882 + 0.26690842067701936 + 0.4016666400432598 + 0.74541666984558219 + + cloud_color + + 0.43948723673439005 + 0.49764935046544778 + 0.50246442938400904 + 1 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.15000000596046448 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0.12999999523162842 + 0 + 0 + 1 + + density_multiplier + + 0.00028125001798306321 + 0 + 0 + 1 + + distance_multiplier + + 6.3874998847643383 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0900000333786011 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.51583333298563971 + 0 + 0 + 1 + + haze_horizon + + 0.13833333183079954 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.28709480166435242 + 0.6259227991104126 + -0.72511875629425049 + 0 + + max_y + + 685.18749099969864 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.67631423473358154 + sunlight_color + + 2.44921875 + 2.44921875 + 2.44921875 + 0.81640625 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2004.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2004.xml new file mode 100644 index 000000000..21cf058bf --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2004.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.41796875 + 1.41796875 + 1.41796875 + 0.47265625 + + blue_density + + 0.12089811412885521 + 0.33770671695460663 + 0.67541757891583387 + 0.76708334654569654 + + blue_horizon + + 0.13497034943045882 + 0.26690842067701936 + 0.4016666400432598 + 0.74541666984558219 + + cloud_color + + 0.43948723673439005 + 0.49764935046544778 + 0.50246442938400904 + 1 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.15000000596046448 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0.12999999523162842 + 0 + 0 + 1 + + density_multiplier + + 0.00028125001798306321 + 0 + 0 + 1 + + distance_multiplier + + 6.3874998847643383 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0900000333786011 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.51583333298563971 + 0 + 0 + 1 + + haze_horizon + + 0.13833333183079954 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.28709480166435242 + 0.6259227991104126 + -0.72511875629425049 + 0 + + max_y + + 685.18749099969864 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.67631423473358154 + sunlight_color + + 1.078125 + 1.078125 + 1.078125 + 0.359375 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2005.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2005.xml new file mode 100644 index 000000000..bb863523a --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Light%2005.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00089999998454004526 + 0 + 0 + 1 + + distance_multiplier + + 22.5 + 0 + 0 + 1 + + east_angle + 3.1415927410125732 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.0199999809265137 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.5 + 1 + + haze_density + + 1.8199999332427979 + 0 + 0 + 1 + + haze_horizon + + 1 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 4.8569567923095747e-008 + 0.83146905899047852 + -0.55557107925415039 + 0 + + max_y + + 3533 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.98174667358398438 + sunlight_color + + 1.5 + 1.5 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Moves%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Moves%20Light.xml new file mode 100644 index 000000000..38ca17aa6 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Moves%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0.39999997615814209 + 0.39999997615814209 + 0.39999997615814209 + 0.19999998807907104 + + blue_horizon + + 1 + 1 + 1 + 0.5 + + cloud_color + + 1 + 0.5 + 0 + 1 + + cloud_pos_density1 + + 1 + 0.65999996662139893 + 0.31099998950958252 + 1 + + cloud_pos_density2 + + 1 + 1 + 0 + 1 + + cloud_scale + + 0.042800001800060272 + 0 + 0 + 1 + + cloud_scroll_rate + + 15.309999465942383 + 14.079999923706055 + + cloud_shadow + + 0.40999999642372131 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 3.7824780941009521 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.26089999079704285 + 0 + 0 + 1 + + glow + + 0.59999942779541016 + 0.0010000000474974513 + -1.75 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 1 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.065092690289020538 + 0.99405622482299805 + -0.087264858186244965 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 2 + sun_angle + 1.4617122411727905 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Music%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Music%20Light%2001.xml new file mode 100644 index 000000000..db2ba2d16 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Lo%20Music%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.15000000596046448 + 0.15000000596046448 + 0.15000000596046448 + 0.05000000074505806 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + cloud_color + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density1 + + 0.15999999642372131 + 0.50999999046325684 + 1 + 1 + + cloud_pos_density2 + + 1 + 0.50999999046325684 + 1 + 1 + + cloud_scale + + 0.059000000357627869 + 0 + 0 + 1 + + cloud_scroll_rate + + 14.409999847412109 + 4.7999997138977051 + + cloud_shadow + + 0.18999999761581421 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 51.200000762939453 + 0 + 0 + 1 + + east_angle + 1.9477875232696533 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.69569998979568481 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -2.5 + 1 + + haze_density + + 0.69999998807907104 + 0 + 0 + 1 + + haze_horizon + + 0.26999998092651367 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.62063354253768921 + 0.74460232257843018 + -0.24572627246379852 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 2 + sun_angle + 0.83993887901306152 + sunlight_color + + 1.5 + 1.5 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2001.xml new file mode 100644 index 000000000..ecae12925 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.1875 + 0.1875 + 0.1875 + 0.0625 + + blue_density + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + blue_horizon + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.70001220703125 + 10.01099967956543 + + cloud_shadow + + 0.44999998807907104 + 0 + 0 + 1 + + density_multiplier + + 0.00014170000213198364 + 0 + 0 + 1 + + distance_multiplier + + 7.9000000953674316 + 0 + 0 + 1 + + east_angle + 1.9477875232696533 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3999999761581421 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.66999995708465576 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.51655691862106323 + 0.83146905899047852 + -0.20451940596103668 + 0 + + max_y + + 21 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.98174667358398438 + sunlight_color + + 2.6999998092651367 + 2.6999998092651367 + 2.6999998092651367 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2002.xml new file mode 100644 index 000000000..d0ba4bb02 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.1875 + 0.1875 + 0.1875 + 0.0625 + + blue_density + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + blue_horizon + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.99409997463226318 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.49579998850822449 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.70001220703125 + 10.01099967956543 + + cloud_shadow + + 0.29999998211860657 + 0 + 0 + 1 + + density_multiplier + + 0.00015750000602565706 + 0 + 0 + 1 + + distance_multiplier + + 4.5999999046325684 + 0 + 0 + 1 + + east_angle + 1.9477875232696533 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3999999761581421 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 1.7400000095367432 + 0 + 0 + 1 + + haze_horizon + + 0.070000000298023224 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.51655691862106323 + 0.83146905899047852 + -0.20451940596103668 + 0 + + max_y + + 11 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.98174667358398438 + sunlight_color + + 2.6999998092651367 + 2.6999998092651367 + 2.6999998092651367 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2003.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2003.xml new file mode 100644 index 000000000..ecae12925 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Mavi%20Light%2003.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.1875 + 0.1875 + 0.1875 + 0.0625 + + blue_density + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + blue_horizon + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.70001220703125 + 10.01099967956543 + + cloud_shadow + + 0.44999998807907104 + 0 + 0 + 1 + + density_multiplier + + 0.00014170000213198364 + 0 + 0 + 1 + + distance_multiplier + + 7.9000000953674316 + 0 + 0 + 1 + + east_angle + 1.9477875232696533 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3999999761581421 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.66999995708465576 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.51655691862106323 + 0.83146905899047852 + -0.20451940596103668 + 0 + + max_y + + 21 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.98174667358398438 + sunlight_color + + 2.6999998092651367 + 2.6999998092651367 + 2.6999998092651367 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Me%20Love%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Me%20Love%20Light.xml new file mode 100644 index 000000000..838e394cb --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Me%20Love%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0.39999997615814209 + 0.39999997615814209 + 0.39999997615814209 + 0.19999998807907104 + + blue_horizon + + 1 + 1 + 1 + 0.5 + + cloud_color + + 1 + 0.5 + 0 + 1 + + cloud_pos_density1 + + 0.2800000011920929 + 0.31999999284744263 + 0.14019998908042908 + 1 + + cloud_pos_density2 + + 0.019999999552965164 + 0.45999997854232788 + 0 + 1 + + cloud_scale + + 0.018199998885393143 + 0 + 0 + 1 + + cloud_scroll_rate + + 15.309999465942383 + 14.079999923706055 + + cloud_shadow + + 1 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 3.7824780941009521 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.69569993019104 + 0 + 0 + 1 + + glow + + 0.59999942779541016 + 0.0010000000474974513 + -1.75 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 1 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.032595228403806686 + 0.99851292371749878 + -0.043697964400053024 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 2 + sun_angle + 1.5162535905838013 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Me%20Mine%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Me%20Mine%20Light.xml new file mode 100644 index 000000000..155a8b9e4 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Me%20Mine%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.0799999237060547 + 0.98999994993209839 + 0.77999997138977051 + 1.0799999237060547 + + blue_density + + 0.64736837148666382 + 0.48414888978004456 + 0.81999999284744263 + 0.40999999642372131 + + blue_horizon + + 0.5 + 0.49548381567001343 + 0.45999997854232788 + 0.51999998092651367 + + cloud_color + + 0.4100000062111997 + 0.4100000062111997 + 0.4100000062111997 + 0.4100000062111997 + + cloud_pos_density1 + + 0.14000000059604645 + 0.62000000476837158 + 1 + 1 + + cloud_pos_density2 + + 0.35999998450279236 + 0.56999999284744263 + 0.12999999523162842 + 1 + + cloud_scale + + 0.35999998450279236 + 0 + 0 + 1.0000000149011612 + + cloud_scroll_rate + + 10.199999791580112 + 10.010999679880427 + + cloud_shadow + + 0.29999998211860657 + 0 + 0 + 1.0000000149011612 + + density_multiplier + + 7.9999997979030013e-005 + 0 + 0 + 1.0000000149011612 + + distance_multiplier + + 5.4000000953674316 + 0 + 0 + 1.0000000149011612 + + east_angle + 1.0932743549346924 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.1699998378753662 + 0 + 0 + 1.0000000149011612 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -0.55000001192092896 + 1 + + haze_density + + 0.31999999284744263 + 0 + 0 + 1 + + haze_horizon + + 0.17999999225139618 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.39627334475517273 + 0.89494067430496216 + -0.20505768060684204 + 0 + + max_y + + 805 + 0 + 0 + 1.0000000149011612 + + preset_num + 28 + star_brightness + 0.25999999046325684 + sun_angle + 2.0332944393157959 + sunlight_color + + 3 + 0 + 0 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Meni%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Meni%20Light%2001.xml new file mode 100644 index 000000000..f308d292e --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Meni%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.28464806749374816 + 0.45923502031814678 + 0.7409173846244812 + 0.7409173846244812 + + blue_density + + 0.25613615825332658 + 0.41819368084009056 + 0.6726322016895665 + 1 + + blue_horizon + + 2 + 1 + 0 + 1 + + cloud_color + + 0.52756190160579308 + 0.52756190160579308 + 0.52756190160579308 + 1 + + cloud_pos_density1 + + 0.72999995946884155 + 0.34000000357627869 + 0.32999998331069946 + 1 + + cloud_pos_density2 + + 0.28999999165534973 + 0.84999996423721313 + 0.019999999552965164 + 1 + + cloud_scale + + 0.32999998058761548 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499399946934318 + 10.010999746491507 + + cloud_shadow + + 0.37000000476837158 + 0 + 0 + 1 + + density_multiplier + + 2.9999999242136255e-005 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 2.9530971050262451 + enable_cloud_scroll + + 0 + 0 + + gamma + + 3.0199999809265137 + 0 + 0 + 1 + + glow + + 0.79999923706054688 + 0.0010000000474974513 + -1.1999999284744263 + 1 + + haze_density + + 2.1499998569488525 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915598630905151 + 0.19915598630905151 + 1 + + lightnorm + + 0.12659277021884918 + 0.7372782826423645 + 0.66362255811691284 + 0 + + max_y + + 711.42973550362512 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 2.3125598430633545 + sunlight_color + + 0.62994743245872087 + 0.69737775977682759 + 0.86806544391379248 + 0.28935515608276319 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Miaa%20light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Miaa%20light%2001.xml new file mode 100644 index 000000000..eedc74c88 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Miaa%20light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 1 + 1 + 1 + 0.5 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.76829999685287476 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.059000000357627869 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00025079998886212707 + 0 + 0 + 1 + + distance_multiplier + + 77.400001525878906 + 0 + 0 + 1 + + east_angle + 0.19477875530719757 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.5699999332427979 + 0 + 0 + 1 + + glow + + 16.80000114440918 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.1190000772476196 + 0 + 0 + 1 + + haze_horizon + + 0.17000000178813934 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.14745019376277924 + 0.64778679609298706 + 0.74741601943969727 + 0 + + max_y + + 2353 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 1.7856996059417725 + sun_angle + 0.70467567443847656 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2001.xml new file mode 100644 index 000000000..e7fa44c7e --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.20632287859916687 + 0.24516719579696655 + 0.33367714285850525 + 0.11122571676969528 + + blue_density + + 0.44999827251961821 + 0.44999970758411817 + 0.45000196070835302 + 1 + + blue_horizon + + 0.23999924952063895 + 0.23999984552653461 + 0.24000005119478959 + 1 + + cloud_color + + 0.22615400012094211 + 0.22615400012094211 + 0.22615400012094211 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999801324269 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.0099999997764825821 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499400180710069 + 10.01099976217745 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 8.9999994088429958e-005 + 0 + 0 + 1 + + distance_multiplier + + 41.100002288818359 + 0 + 0 + 1 + + east_angle + 1.5707963705062866 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.0000000000004476 + 0.0010000000424271499 + -0.47999998973471036 + 1 + + haze_density + + 0.20999999344348907 + 0 + 0 + 1 + + haze_horizon + + 0.20999999344348907 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.83147060871124268 + 0.55556869506835938 + -3.6344733445048405e-008 + 1 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 1.9999886751174927 + sun_angle + 3.7306394577026367 + sunlight_color + + 0.45637205243110657 + 0.46549969911575317 + 0.86362791061401367 + 0.28787598013877869 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2002.xml new file mode 100644 index 000000000..99d59e510 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.20405027270317078 + 0.24246673285961151 + 0.32999998331069946 + 0.10999999940395355 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density1 + + 0.12999999523162842 + 0.31999999284744263 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.74000000953674316 + 0.17999999225139618 + 1 + + cloud_scale + + 0.99999994039535522 + 0 + 0 + 1 + + cloud_scroll_rate + + 16.869998931884766 + 16.760000228881836 + + cloud_shadow + + 0.2199999988079071 + 0 + 0 + 1 + + density_multiplier + + 0.00032459996873512864 + 0 + 0 + 1 + + distance_multiplier + + 85.300003051757813 + 0 + 0 + 1 + + east_angle + 1.0807079076766968 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.1999998092651367 + 0.0010000000474974513 + -0.39999997615814209 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0.019999999552965164 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.79044967889785767 + 0.44424447417259216 + -0.42170625925064087 + 1 + + max_y + + 303 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 2 + sun_angle + 5.8228545188903809 + sunlight_color + + 1.390916109085083 + 1.4052181243896484 + 2.0290837287902832 + 0.67636126279830933 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2003.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2003.xml new file mode 100644 index 000000000..f6b4ddab8 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2003.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.38972097635269165 + 0.46309363842010498 + 0.63027900457382202 + 0.21009300649166107 + + blue_density + + 0.44999827251961821 + 0.44999970758411817 + 0.45000196070835302 + 1 + + blue_horizon + + 0.23999924952063895 + 0.23999984552653461 + 0.24000005119478959 + 1 + + cloud_color + + 0.22615400012094211 + 0.22615400012094211 + 0.22615400012094211 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999801324269 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 3 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499400180710069 + 10.01099976217745 + + cloud_shadow + + 0.22999998927116394 + 0 + 0 + 1 + + density_multiplier + + 8.9999994088429958e-005 + 0 + 0 + 1 + + distance_multiplier + + 41.100002288818359 + 0 + 0 + 1 + + east_angle + 2.8588495254516602 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.0000000000004476 + 0.0010000000424271499 + -0.47999998973471036 + 1 + + haze_density + + 0.20999999344348907 + 0 + 0 + 1 + + haze_horizon + + 0.20999999344348907 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.23529607057571411 + 0.53731352090835571 + 0.80989503860473633 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 500 + sun_angle + 2.5743441581726074 + sunlight_color + + 0.5808371901512146 + 0.59245419502258301 + 1.0991628170013428 + 0.36638760566711426 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2004.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2004.xml new file mode 100644 index 000000000..76c2aed13 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2004.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.20405027270317078 + 0.24246673285961151 + 0.32999998331069946 + 0.10999999940395355 + + blue_density + + 0.23251199722290039 + 0.23716199398040771 + 0.43999999761581421 + 0.2199999988079071 + + blue_horizon + + 0.23999999463558197 + 0.23999999463558197 + 0.23999999463558197 + 1 + + cloud_color + + 0.625 + 0.625 + 0.875 + 0.875 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999523162842 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.17359998822212219 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.11999999731779099 + 0 + 0 + 1 + + density_multiplier + + 0.00033069998607970774 + 0 + 0 + 1 + + distance_multiplier + + 70.900001525878906 + 0 + 0 + 1 + + east_angle + 1.9666372537612915 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 1.5999999046325684 + 0 + 0 + 1 + + haze_horizon + + 0.019999999552965164 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.41169273853302002 + 0.89493530988693237 + 0.17204611003398895 + 1 + + max_y + + 308 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 2 + sun_angle + 5.1748991012573242 + sunlight_color + + 0.93348866701126099 + 0.95215761661529541 + 1.7665112018585205 + 0.58883708715438843 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2005.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2005.xml new file mode 100644 index 000000000..496ab40eb --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2005.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.20405027270317078 + 0.24246673285961151 + 0.32999998331069946 + 0.10999999940395355 + + blue_density + + 0.23251199722290039 + 0.23716199398040771 + 0.43999999761581421 + 0.2199999988079071 + + blue_horizon + + 0.23999999463558197 + 0.23999999463558197 + 0.23999999463558197 + 1 + + cloud_color + + 0.625 + 0.625 + 0.875 + 0.875 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999523162842 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.17359998822212219 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.11999999731779099 + 0 + 0 + 1 + + density_multiplier + + 0.00033069998607970774 + 0 + 0 + 1 + + distance_multiplier + + 70.900001525878906 + 0 + 0 + 1 + + east_angle + 2.3499114513397217 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.0899999141693115 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 1.5999999046325684 + 0 + 0 + 1 + + haze_horizon + + 0.019999999552965164 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.37705510854721069 + 0.84804928302764893 + 0.37234652042388916 + 1 + + max_y + + 308 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 2 + sun_angle + 5.2708921432495117 + sunlight_color + + 0.34876799583435059 + 0.50438410043716431 + 0.65999996662139893 + 0.2199999988079071 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2006.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2006.xml new file mode 100644 index 000000000..715252787 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2006.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.20632287859916687 + 0.24516719579696655 + 0.33367714285850525 + 0.11122571676969528 + + blue_density + + 0 + 0 + 1 + 0.5 + + blue_horizon + + 1 + 0.5 + 0 + 0.5 + + cloud_color + + 0.22615400012094211 + 0.22615400012094211 + 0.22615400012094211 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999801324269 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.0099999997764825821 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499400180710069 + 10.01099976217745 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 20.200000762939453 + 0 + 0 + 1 + + east_angle + 1.5707963705062866 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.0199999809265137 + 0 + 0 + 1 + + glow + + 6.8000006675720215 + 0.0010000000474974513 + -0.69999998807907104 + 1 + + haze_density + + 1 + 0 + 0 + 1 + + haze_horizon + + 0.48999997973442078 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.85491305589675903 + 0.51877129077911377 + -3.7369435545997476e-008 + 1 + + max_y + + 1333 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 3.6870057582855225 + sunlight_color + + 0.45637205243110657 + 0.46549969911575317 + 0.86362791061401367 + 0.28787598013877869 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2007.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2007.xml new file mode 100644 index 000000000..739c63c99 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2007.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.32094669342041016 + 0.38137125968933105 + 0.51905333995819092 + 0.17301777005195618 + + blue_density + + 0.44999827251961821 + 0.44999970758411817 + 0.45000196070835302 + 1 + + blue_horizon + + 0.23999924952063895 + 0.23999984552653461 + 0.24000005119478959 + 1 + + cloud_color + + 0.22615400012094211 + 0.22615400012094211 + 0.22615400012094211 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999801324269 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 3 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.20001220703125 + 10.01099976217745 + + cloud_shadow + + 0.15999999642372131 + 0 + 0 + 1 + + density_multiplier + + 8.9999994088429958e-005 + 0 + 0 + 1 + + distance_multiplier + + 41.100002288818359 + 0 + 0 + 1 + + east_angle + 2.7646017074584961 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.0000000000004476 + 0.0010000000424271499 + -0.47999998973471036 + 1 + + haze_density + + 0.20999999344348907 + 0 + 0 + 1 + + haze_horizon + + 0.20999999344348907 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.31046971678733826 + 0.53731352090835571 + 0.78415733575820923 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 500 + sun_angle + 2.5743441581726074 + sunlight_color + + 0.6015813946723938 + 0.61361336708068848 + 1.1384185552597046 + 0.37947285175323486 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2008.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2008.xml new file mode 100644 index 000000000..b0fad0999 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Moon%20Light%2008.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.32094669342041016 + 0.38137125968933105 + 0.51905333995819092 + 0.17301777005195618 + + blue_density + + 0.44999827251961821 + 0.44999970758411817 + 0.45000196070835302 + 1 + + blue_horizon + + 0.23999924952063895 + 0.23999984552653461 + 0.24000005119478959 + 1 + + cloud_color + + 0.22615400012094211 + 0.22615400012094211 + 0.22615400012094211 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999801324269 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 3 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.20001220703125 + 10.01099976217745 + + cloud_shadow + + 0.15999999642372131 + 0 + 0 + 1 + + density_multiplier + + 8.9999994088429958e-005 + 0 + 0 + 1 + + distance_multiplier + + 41.100002288818359 + 0 + 0 + 1 + + east_angle + 2.8588495254516602 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.0000000000004476 + 0.0010000000424271499 + -0.47999998973471036 + 1 + + haze_density + + 0.20999999344348907 + 0 + 0 + 1 + + haze_horizon + + 0.20999999344348907 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.23529607057571411 + 0.53731352090835571 + 0.80989503860473633 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 500 + sun_angle + 2.5743441581726074 + sunlight_color + + 0.6015813946723938 + 0.6136133074760437 + 1.1384185552597046 + 0.37947285175323486 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Never%20Night%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Never%20Night%20Light.xml new file mode 100644 index 000000000..cc3e25245 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Never%20Night%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0.30000001192092896 + 0.10000000149011612 + + blue_density + + 0.12089811412885521 + 0.33770671695460663 + 0.67541757891583387 + 0.76708334654569654 + + blue_horizon + + 0.13497034943045882 + 0.26690842067701936 + 0.4016666400432598 + 0.74541666984558219 + + cloud_color + + 0.43948723673439005 + 0.49764935046544778 + 0.50246442938400904 + 1 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.18000000715255737 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 1 + 0 + 0 + 1 + + density_multiplier + + 0.00028125001798306321 + 0 + 0 + 1 + + distance_multiplier + + 6.3874998847643383 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.12999999523162842 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.51583333298563971 + 0 + 0 + 1 + + haze_horizon + + 0.13833333183079954 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.28709480166435242 + 0.6259227991104126 + -0.72511875629425049 + 0 + + max_y + + 685.18749099969864 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.67631423473358154 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20No%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20No%20Light.xml new file mode 100644 index 000000000..2ca2ef77b --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20No%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0.12089811412885521 + 0.33770671695460663 + 0.67541757891583387 + 0.76708334654569654 + + blue_horizon + + 0.13497034943045882 + 0.26690842067701936 + 0.4016666400432598 + 0.74541666984558219 + + cloud_color + + 0.43948723673439005 + 0.49764935046544778 + 0.50246442938400904 + 1 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.18000000715255737 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00028125001798306321 + 0 + 0 + 1 + + distance_multiplier + + 6.3874998847643383 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0900000333786011 + 0 + 0 + 1 + + glow + + 9.4000005722045898 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.51583333298563971 + 0 + 0 + 1 + + haze_horizon + + 0.13833333183079954 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.28709480166435242 + 0.6259227991104126 + -0.72511875629425049 + 0 + + max_y + + 685.18749099969864 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.1029166579246521 + sun_angle + 0.67631423473358154 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Owlery%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Owlery%20Light.xml new file mode 100644 index 000000000..dca43b27f --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Owlery%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.56250005960464478 + 0.26250001788139343 + 0.75 + 0.25 + + blue_density + + 0 + 0.40999585390090942 + 0.81999999284744263 + 0.85999995470046997 + + blue_horizon + + 0.43999999761581421 + 0.22910800576210022 + 0.26829266548156738 + 0.2199999988079071 + + cloud_color + + 0.23999999463558197 + 0.4699999988079071 + 0.31999999284744263 + 0.4699999988079071 + + cloud_pos_density1 + + 0.48999997973442078 + 0.50999999046325684 + 0.74000000953674316 + 1 + + cloud_pos_density2 + + 0.44999998807907104 + 0.5 + 0.14000000059604645 + 1 + + cloud_scale + + 0.0835999995470047 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00035999997635371983 + 0 + 0 + 1 + + distance_multiplier + + 2 + 0 + 0 + 1 + + east_angle + 1.3257522583007813 + enable_cloud_scroll + + 0 + 0 + + gamma + + 2.0299999713897705 + 0 + 0 + 1 + + glow + + 0.39999961853027344 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 0.77999997138977051 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.9694594144821167 + 0.037081710994243622 + -0.24243222177028656 + 0 + + max_y + + 591 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.0099999904632568 + sun_angle + 3.1045024394989014 + sunlight_color + + 2.5799999237060547 + 2.4411697387695313 + 2.4411697387695313 + 0.85999995470046997 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Puppy%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Puppy%20Light.xml new file mode 100644 index 000000000..19151d34b --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Puppy%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0.75 + 1.5 + 0.5 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0 + 0.79687601327896118 + 0.79687398672103882 + 0.39843800663948059 + + cloud_color + + 0.43948723673439005 + 0.49764935046544778 + 0.50246442938400904 + 1 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 31.5 + 0 + 0 + 1 + + east_angle + 6.0507078170776367 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.4900000095367432 + 0 + 0 + 1 + + glow + + 4.8000001907348633 + 0.0010000000474974513 + -4.1499996185302734 + 1 + + haze_density + + 0.42999997735023499 + 0 + 0 + 1 + + haze_horizon + + 0.70999997854232788 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.15858890116214752 + 0.72537636756896973 + -0.66983485221862793 + 1 + + max_y + + 0 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 500 + sun_angle + 5.4716043472290039 + sunlight_color + + 0 + 1.5058825016021729 + 1.5058825016021729 + 0.50196081399917603 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Queen%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Queen%20Light%2001.xml new file mode 100644 index 000000000..6db5852e7 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Queen%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.1875 + 0.1875 + 0.1875 + 0.0625 + + blue_density + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + blue_horizon + + 1.7999999523162842 + 1.7999999523162842 + 1.7999999523162842 + 0.89999997615814209 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.70001220703125 + 10.01099967956543 + + cloud_shadow + + 0.44999998807907104 + 0 + 0 + 1 + + density_multiplier + + 0.00014170000213198364 + 0 + 0 + 1 + + distance_multiplier + + 7.9000000953674316 + 0 + 0 + 1 + + east_angle + 1.9477875232696533 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3999999761581421 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.69999998807907104 + 0 + 0 + 1 + + haze_horizon + + 0.20999999344348907 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.51655691862106323 + 0.83146905899047852 + -0.20451940596103668 + 0 + + max_y + + 77 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.98174667358398438 + sunlight_color + + 2.6999998092651367 + 2.6999998092651367 + 2.6999998092651367 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Quidditch%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Quidditch%20Light.xml new file mode 100644 index 000000000..1e756c8f5 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Quidditch%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.35999998450279236 + 0.21600005030632019 + 0 + 0.11999999731779099 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.31999999284744263 + 0.31999999284744263 + 0.15999999642372131 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12459999322891235 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.23999999463558197 + 0 + 0 + 1 + + density_multiplier + + 0.00031000000308267772 + 0 + 0 + 1 + + distance_multiplier + + 6.8000001907348633 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3042999505996704 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.36227512359619141 + -0.93207120895385742 + 0 + + max_y + + 752 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7708849906921387 + sunlight_color + + 1.3499999046325684 + 1.3499999046325684 + 1.3499999046325684 + 0.44999998807907104 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Save%20Me%20Light%20.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Save%20Me%20Light%20.xml new file mode 100644 index 000000000..50fd94c0c --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Save%20Me%20Light%20.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density1 + + 0.95999997854232788 + 0.31000000238418579 + 3 + 1 + + cloud_pos_density2 + + 1 + 1 + 0.5 + 1 + + cloud_scale + + 0.79339998960494995 + 0 + 0 + 1 + + cloud_scroll_rate + + 18.5 + -3 + + cloud_shadow + + 0.15999999642372131 + 0 + 0 + 1 + + density_multiplier + + 3.299999889350147e-006 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 3.1855752468109131 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 15.799999237060547 + 0.0010000000474974513 + -0.74999994039535522 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 4.8899998664855957 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.040397927165031433 + 0.39473667740821838 + -0.91790574789047241 + 0 + + max_y + + 385 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 500 + sun_angle + 0.40578123927116394 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Shadow%20Testing%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Shadow%20Testing%20Light.xml new file mode 100644 index 000000000..5b10b3dbe --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Shadow%20Testing%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0.24475815892219543 + 0.44872328639030457 + 0.75999999046325684 + 0.37999999523162842 + + blue_horizon + + 0.49548381567001343 + 0.49548381567001343 + 0.63999998569488525 + 0.31999999284744263 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00017999998817685992 + 0 + 0 + 1 + + distance_multiplier + + 0.80000001192092896 + 0 + 0 + 1 + + east_angle + 3.1415927410125732 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3912999629974365 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.69999998807907104 + 0 + 0 + 1 + + haze_horizon + + 0.18999999761581421 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 7.923197387071923e-008 + 0.42261755466461182 + -0.90630811452865601 + 0 + + max_y + + 1605 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.43633154034614563 + sunlight_color + + 0 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Still%20Life.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Still%20Life.xml new file mode 100644 index 000000000..f6d948d24 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Still%20Life.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.21000000834465027 + 0.21000000834465027 + 0.21000000834465027 + 0.070000000298023224 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.31999999284744263 + 0.31999999284744263 + 0.15999999642372131 + + cloud_color + + 0.13600000739097595 + 0.17000001668930054 + 0.20399999618530273 + 0.20399999618530273 + + cloud_pos_density1 + + 0.42999997735023499 + 0.55000001192092896 + 0.83429998159408569 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.14000000059604645 + 1 + + cloud_scale + + 0.052799999713897705 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.21725988388061523 + 0 + 0 + 1 + + density_multiplier + + 0.00011869999434566125 + 0 + 0 + 1 + + distance_multiplier + + 25.700000762939453 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 0 + 0 + + gamma + + 2.2999999523162842 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + 0.39999961853027344 + 1 + + haze_density + + 0.1120000034570694 + 0 + 0 + 1 + + haze_horizon + + 0.44800001382827759 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.54830676317214966 + -0.8362773060798645 + 0 + + max_y + + 813 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.5612545013427734 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Thalia%20Light%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Thalia%20Light%2001.xml new file mode 100644 index 000000000..099c6d4a1 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Thalia%20Light%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 1 + 1 + 0.5 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 0.5 + 0.5 + 0.5 + 0.5 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.76829999685287476 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.059000000357627869 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940033104544 + 10.011000058908452 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00020469998707994819 + 0 + 0 + 1 + + distance_multiplier + + 2.5 + 0 + 0 + 1 + + east_angle + 2.060884952545166 + enable_cloud_scroll + + 1 + 1 + + gamma + + 4.4000000953674316 + 0 + 0 + 1 + + glow + + 16.80000114440918 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0.81999999284744263 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.77900981903076172 + 0.46948650479316711 + 0.41560328006744385 + 0 + + max_y + + 2538 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 1.7856996059417725 + sun_angle + 2.6528835296630859 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Thalia%20Light%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Thalia%20Light%2002.xml new file mode 100644 index 000000000..9e05253dd --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Thalia%20Light%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.54000002145767212 + 0.54000002145767212 + 0.54000002145767212 + 0.18000000715255737 + + blue_density + + 0.24475815892219543 + 0.44872328639030457 + 0.75999999046325684 + 0.37999999523162842 + + blue_horizon + + 0.49548381567001343 + 0.49548381567001343 + 0.63999998569488525 + 0.31999999284744263 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00014999999257270247 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 0.9424777626991272 + enable_cloud_scroll + + 1 + 1 + + gamma + + 5.6700000762939453 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 0.28999999165534973 + 0 + 0 + 1 + + haze_horizon + + 0.20999999344348907 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.67267239093780518 + 0.55557155609130859 + -0.48872512578964233 + 0 + + max_y + + 1605 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 2.5525424480438232 + sunlight_color + + 0.81000006198883057 + 0.81000006198883057 + 0.81000006198883057 + 0.27000001072883606 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Trilogy%20Rain%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Trilogy%20Rain%2001.xml new file mode 100644 index 000000000..cd6911207 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Trilogy%20Rain%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0.13497035205364227 + 0.26690840721130371 + 0.40166664123535156 + 0.20083332061767578 + + cloud_color + + 0 + 0 + 0 + 0 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.99999994039535522 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0.59999996423721313 + 0 + 0 + 1 + + density_multiplier + + 0.00011999999696854502 + 0 + 0 + 1 + + distance_multiplier + + 20.899999618530273 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.2400000095367432 + 0 + 0 + 1 + + glow + + 1.399998664855957 + 0.0010000000474974513 + -0.44999998807907104 + 1 + + haze_density + + 0.84999996423721313 + 0 + 0 + 1 + + haze_horizon + + 0.40999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.071817018091678619 + 0.9807855486869812 + 0.18138909339904785 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.7671444416046143 + sunlight_color + + 0.014999985694885254 + 1.0545001029968262 + 2.9850001335144043 + 0.99500000476837158 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Trilogy%20Rain%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Trilogy%20Rain%2002.xml new file mode 100644 index 000000000..9b3f6d522 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Trilogy%20Rain%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0.13497035205364227 + 0.26690840721130371 + 0.40166664123535156 + 0.20083332061767578 + + cloud_color + + 0 + 0 + 0 + 0 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.99999994039535522 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00014999999257270247 + 0 + 0 + 1 + + distance_multiplier + + 14 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.2400000095367432 + 0 + 0 + 1 + + glow + + 1.399998664855957 + 0.0010000000474974513 + -2.2999999523162842 + 1 + + haze_density + + 3.6499998569488525 + 0 + 0 + 1 + + haze_horizon + + 0.75999999046325684 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.071817018091678619 + 0.9807855486869812 + 0.18138909339904785 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 1.7671444416046143 + sunlight_color + + 0.014999985694885254 + 1.0545001029968262 + 2.9850001335144043 + 0.99500000476837158 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2001.xml new file mode 100644 index 000000000..df2feee22 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.38999998569488525 + 0.38999998569488525 + 0.38999998569488525 + 0.12999999523162842 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.78999996185302734 + 0.90999996662139893 + 0.11589999496936798 + 1 + + cloud_pos_density2 + + 1 + 1 + 0 + 1 + + cloud_scale + + 0.026499999687075615 + 0 + 0 + 1 + + cloud_scroll_rate + + 17.770000457763672 + 4.4699997901916504 + + cloud_shadow + + 1 + 0 + 0 + 1 + + density_multiplier + + 0.00033199999597854912 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 2.7457520961761475 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.057900000363588333 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -0.14999999105930328 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.18987095355987549 + 0.87035512924194336 + -0.45434671640396118 + 0 + + max_y + + 2758 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 2 + sun_angle + 1.0559231042861938 + sunlight_color + + 2.6999998092651367 + 2.6999998092651367 + 2.6999998092651367 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2002.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2002.xml new file mode 100644 index 000000000..85dd15757 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2002.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.38999998569488525 + 0.38999998569488525 + 0.38999998569488525 + 0.12999999523162842 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.78999996185302734 + 0.90999996662139893 + 0.23999999463558197 + 1 + + cloud_pos_density2 + + 1 + 1 + 0 + 1 + + cloud_scale + + 0.4681999683380127 + 0 + 0 + 1 + + cloud_scroll_rate + + 17.770000457763672 + 4.4699997901916504 + + cloud_shadow + + 0.75 + 0 + 0 + 1 + + density_multiplier + + 0.00033199999597854912 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 2.7457520961761475 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.057900000363588333 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -0.14999999105930328 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.18987095355987549 + 0.87035512924194336 + -0.45434671640396118 + 0 + + max_y + + 2758 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 2 + sun_angle + 1.0559231042861938 + sunlight_color + + 2.6999998092651367 + 2.6999998092651367 + 2.6999998092651367 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2003.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2003.xml new file mode 100644 index 000000000..9dbfd2a7d --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20White%20Fire%20Sky%2003.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.4399999380111694 + 1.4399999380111694 + 1.4399999380111694 + 0.47999998927116394 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 0.78999996185302734 + 0.90999996662139893 + 0.11589999496936798 + 1 + + cloud_pos_density2 + + 1 + 1 + 0 + 1 + + cloud_scale + + 0.024799998849630356 + 0 + 0 + 1 + + cloud_scroll_rate + + 17.770000457763672 + 4.4699997901916504 + + cloud_shadow + + 1 + 0 + 0 + 1 + + density_multiplier + + 0.00033069998607970774 + 0 + 0 + 1 + + distance_multiplier + + 31.5 + 0 + 0 + 1 + + east_angle + 2.7457520961761475 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.18999999761581421 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -0.14999999105930328 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.18987095355987549 + 0.87035512924194336 + -0.45434671640396118 + 0 + + max_y + + 3000 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 500 + sun_angle + 1.0559231042861938 + sunlight_color + + 2.6999998092651367 + 2.6999998092651367 + 2.6999998092651367 + 0.89999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20Yellow%20Stars%2001.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Yellow%20Stars%2001.xml new file mode 100644 index 000000000..778c1c58b --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20Yellow%20Stars%2001.xml @@ -0,0 +1,141 @@ + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 1 + 1 + 2 + 1 + + blue_horizon + + 1.2800000905990601 + 1.2799999713897705 + 0 + 0.64000004529953003 + + cloud_color + + 0.43948723673439005 + 0.49764935046544778 + 0.50246442938400904 + 1 + + cloud_pos_density1 + + 0.57999998331069946 + 0.87000000476837158 + 0.75 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.073541670078411725 + 1 + + cloud_scale + + 0.18000000715255737 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.088005410620646 + 10.010458310484864 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00033069998607970774 + 0 + 0 + 1 + + distance_multiplier + + -13761.5 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0900000333786011 + 0 + 0 + 1 + + glow + + 3.0000019073486328 + 0.0010000000474974513 + 10 + 1 + + haze_density + + 4.7799997329711914 + 0 + 0 + 1 + + haze_horizon + + 0.34999999403953552 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.26703047752380371 + 0.68834781646728516 + -0.67444199323654175 + 0 + + max_y + + 5691 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 500 + sun_angle + 0.75920891761779785 + sunlight_color + + 3 + 3 + 1.5 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Phototools%2D%20rara%20Fall%20Home%20Light.xml b/indra/newview/app_settings/windlight/skies/Phototools%2D%20rara%20Fall%20Home%20Light.xml new file mode 100644 index 000000000..466de5aae --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Phototools%2D%20rara%20Fall%20Home%20Light.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.42000001668930054 + 0.42000001668930054 + 0.42000001668930054 + 0.14000000059604645 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.31999999284744263 + 0.31999999284744263 + 0.15999999642372131 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 7.8699995356146246e-005 + 0 + 0 + 1 + + distance_multiplier + + 79.5 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 3.809999942779541 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + 0.39999961853027344 + 1 + + haze_density + + 0.22400000691413879 + 0 + 0 + 1 + + haze_horizon + + 0.67200005054473877 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.17796146869659424 + -0.98403745889663696 + 0 + + max_y + + 813 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.9626781940460205 + sunlight_color + + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + 0.45999997854232788 + + + diff --git a/indra/newview/app_settings/windlight/water/Phototools%2D%20Black%20Default%20.xml b/indra/newview/app_settings/windlight/water/Phototools%2D%20Black%20Default%20.xml new file mode 100644 index 000000000..31cc98580 --- /dev/null +++ b/indra/newview/app_settings/windlight/water/Phototools%2D%20Black%20Default%20.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.060000002384185791 + fresnelOffset + 0.56000000238418579 + fresnelScale + 1 + normScale + + 10 + 10 + 10 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0.029999999329447746 + scaleBelow + 0.20000000298023224 + underWaterFogMod + 0.25 + waterFogColor + + 0 + 0 + 0 + 1 + + waterFogDensity + 16 + wave1Dir + + 1.0499997138977051 + -0.42000007629394531 + + wave2Dir + + 1.1099996566772461 + -1.1600000858306885 + + + diff --git a/indra/newview/app_settings/windlight/water/Phototools%2D%20Breakwave%20Building%20Water.xml b/indra/newview/app_settings/windlight/water/Phototools%2D%20Breakwave%20Building%20Water.xml new file mode 100644 index 000000000..2c5596edb --- /dev/null +++ b/indra/newview/app_settings/windlight/water/Phototools%2D%20Breakwave%20Building%20Water.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.040000002831220627 + fresnelOffset + 0.5 + fresnelScale + 0.39999997615814209 + normScale + + 2 + 2 + 2 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0.029999999329447746 + scaleBelow + 0.20000000298023224 + underWaterFogMod + 0.25 + waterFogColor + + 0 + 0 + 0 + 1 + + waterFogDensity + 16 + wave1Dir + + 1.0499997138977051 + -0.42000007629394531 + + wave2Dir + + 1.1099996566772461 + -1.1600000858306885 + + + diff --git a/indra/newview/app_settings/windlight/water/Phototools%2D%20Chandra%20Sea.xml b/indra/newview/app_settings/windlight/water/Phototools%2D%20Chandra%20Sea.xml new file mode 100644 index 000000000..93989f25b --- /dev/null +++ b/indra/newview/app_settings/windlight/water/Phototools%2D%20Chandra%20Sea.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.040000002831220627 + fresnelOffset + 0.55000001192092896 + fresnelScale + 0.62999999523162842 + normScale + + 0 + 0.60000002384185791 + 4.7000002861022949 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0 + scaleBelow + 0 + underWaterFogMod + 0.5 + waterFogColor + + 0.19140625 + 0.19140625 + 0.19140625 + 1 + + waterFogDensity + 6.9644041061401367 + wave1Dir + + -0.34000015258789063 + -0.19000005722045898 + + wave2Dir + + -1.4000000953674316 + -0.98000001907348633 + + + diff --git a/indra/newview/app_settings/windlight/water/Phototools%2D%20Gallery%20Water%2001.xml b/indra/newview/app_settings/windlight/water/Phototools%2D%20Gallery%20Water%2001.xml new file mode 100644 index 000000000..d3cf6f6d8 --- /dev/null +++ b/indra/newview/app_settings/windlight/water/Phototools%2D%20Gallery%20Water%2001.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.040000002831220627 + fresnelOffset + 0.5 + fresnelScale + 0.39999997615814209 + normScale + + 2 + 2 + 2 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0.029999999329447746 + scaleBelow + 0.20000000298023224 + underWaterFogMod + 0.25 + waterFogColor + + 0 + 0 + 0 + 1 + + waterFogDensity + 16 + wave1Dir + + 0.529998779296875 + -0.21000099182128906 + + wave2Dir + + 0.55999946594238281 + -0.57999992370605469 + + + diff --git a/indra/newview/app_settings/windlight/water/Phototools%2D%20Ship%20Light.xml b/indra/newview/app_settings/windlight/water/Phototools%2D%20Ship%20Light.xml new file mode 100644 index 000000000..6a4708dac --- /dev/null +++ b/indra/newview/app_settings/windlight/water/Phototools%2D%20Ship%20Light.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.040000002831220627 + fresnelOffset + 0.5899999737739563 + fresnelScale + 0.22999998927116394 + normScale + + 1.3000000715255737 + 5.0999999046325684 + 2.2999999523162842 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0 + scaleBelow + 0 + underWaterFogMod + 0.5 + waterFogColor + + 0 + 0 + 0 + 1 + + waterFogDensity + 6.9644041061401367 + wave1Dir + + -0.34000015258789063 + -0.19000005722045898 + + wave2Dir + + -1.4000000953674316 + -0.98000001907348633 + + + From a559a092171f80fff7054fa059cba66499d3efe1 Mon Sep 17 00:00:00 2001 From: Rye Mutt Date: Wed, 9 Oct 2019 16:52:46 -0400 Subject: [PATCH 08/66] Fix a ton of small bugs in 64bit memory value handling --- indra/llcommon/llmemory.cpp | 164 ++++++++------------------ indra/llcommon/llmemory.h | 11 +- indra/llcommon/llsys.cpp | 103 ++++++---------- indra/llcommon/llsys.h | 5 - indra/newview/llappviewer.cpp | 6 +- indra/newview/llfeaturemanager.cpp | 2 +- indra/newview/llviewerdisplay.cpp | 4 +- indra/newview/llviewertexturelist.cpp | 8 +- indra/newview/llviewerwindow.cpp | 2 +- 9 files changed, 99 insertions(+), 206 deletions(-) diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index f843f3c96..1b73507a1 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -102,39 +102,47 @@ void LLMemory::initMaxHeapSizeGB(F32Gigabytes max_heap_size, BOOL prevent_heap_f //static void LLMemory::updateMemoryInfo() { -#if LL_WINDOWS - HANDLE self = GetCurrentProcess(); - PROCESS_MEMORY_COUNTERS counters; - - if (!GetProcessMemoryInfo(self, &counters, sizeof(counters))) +#if LL_WINDOWS + PROCESS_MEMORY_COUNTERS_EX counters; + counters.cb = sizeof(counters); + + if (!GetProcessMemoryInfo(GetCurrentProcess(), (PROCESS_MEMORY_COUNTERS*) &counters, sizeof(counters))) { LL_WARNS() << "GetProcessMemoryInfo failed" << LL_ENDL; - return ; + return; } - sAllocatedMemInKB = (U32Bytes)(counters.WorkingSetSize) ; - sAllocatedPageSizeInKB = (U32Bytes)(counters.PagefileUsage) ; + sAllocatedMemInKB = U64Bytes(counters.WorkingSetSize); + sAllocatedPageSizeInKB = (counters.PagefileUsage != 0) ? U64Bytes(counters.PagefileUsage) : U64Bytes(counters.PrivateUsage); - U32Kilobytes avail_phys, avail_virtual; - LLMemoryInfo::getAvailableMemoryKB(avail_phys, avail_virtual) ; - sMaxPhysicalMemInKB = llmin(avail_phys + sAllocatedMemInKB, sMaxHeapSizeInKB); - - if(sMaxPhysicalMemInKB > sAllocatedMemInKB) + MEMORYSTATUSEX memorystat; + memorystat.dwLength = sizeof(memorystat); + if (!GlobalMemoryStatusEx(&memorystat)) { - sAvailPhysicalMemInKB = sMaxPhysicalMemInKB - sAllocatedMemInKB ; + LL_WARNS() << "GlobalMemoryStatusEx failed" << LL_ENDL; + return; + } +#if (defined(_WIN64) || defined(__amd64__) || defined(__x86_64__)) + sMaxPhysicalMemInKB = U64Bytes(memorystat.ullTotalPhys); + sAvailPhysicalMemInKB = U64Bytes(memorystat.ullAvailPhys); +#else + sMaxPhysicalMemInKB = llmin(U32Kilobytes(U64Bytes(memorystat.ullTotalPhys)), sMaxHeapSizeInKB); + if (sMaxPhysicalMemInKB > sAllocatedMemInKB) + { + sAvailPhysicalMemInKB = U64Bytes(memorystat.ullAvailPhys);; } else { sAvailPhysicalMemInKB = U32Kilobytes(0); } -#else - //not valid for other systems for now. - sAllocatedMemInKB = (U32Bytes)LLMemory::getCurrentRSS(); - sMaxPhysicalMemInKB = (U32Bytes)U32_MAX ; - sAvailPhysicalMemInKB = (U32Bytes)U32_MAX ; #endif - return ; +#else + //not valid for other systems for now. + sAllocatedMemInKB = U64Bytes(LLMemory::getCurrentRSS()); + sMaxPhysicalMemInKB = U64Bytes(U32_MAX); + sAvailPhysicalMemInKB = U64Bytes(U32_MAX); +#endif } // @@ -158,7 +166,7 @@ void* LLMemory::tryToAlloc(void* address, U32 size) return address ; #else return (void*)0x01 ; //skip checking -#endif +#endif } //static @@ -233,31 +241,31 @@ bool LLMemory::isMemoryPoolLow() //static U32Kilobytes LLMemory::getAvailableMemKB() { - return sAvailPhysicalMemInKB ; + return sAvailPhysicalMemInKB; } //static U32Kilobytes LLMemory::getMaxMemKB() { - return sMaxPhysicalMemInKB ; + return sMaxPhysicalMemInKB; } //static U32Kilobytes LLMemory::getAllocatedMemKB() { - return sAllocatedMemInKB ; + return sAllocatedMemInKB; } //---------------------------------------------------------------------------- #if defined(LL_WINDOWS) +//static U64 LLMemory::getCurrentRSS() { - HANDLE self = GetCurrentProcess(); PROCESS_MEMORY_COUNTERS counters; - - if (!GetProcessMemoryInfo(self, &counters, sizeof(counters))) + + if (!GetProcessMemoryInfo(GetCurrentProcess(), &counters, sizeof(counters))) { LL_WARNS() << "GetProcessMemoryInfo failed" << LL_ENDL; return 0; @@ -266,35 +274,7 @@ U64 LLMemory::getCurrentRSS() return counters.WorkingSetSize; } -//static -U32 LLMemory::getWorkingSetSize() -{ - PROCESS_MEMORY_COUNTERS pmc ; - U32 ret = 0 ; - - if (GetProcessMemoryInfo( GetCurrentProcess(), &pmc, sizeof(pmc)) ) - { - ret = pmc.WorkingSetSize ; - } - - return ret ; -} - #elif defined(LL_DARWIN) - -/* - The API used here is not capable of dealing with 64-bit memory sizes, but is available before 10.4. - - Once we start requiring 10.4, we can use the updated API, which looks like this: - - task_basic_info_64_data_t basicInfo; - mach_msg_type_number_t basicInfoCount = TASK_BASIC_INFO_64_COUNT; - if (task_info(mach_task_self(), TASK_BASIC_INFO_64, (task_info_t)&basicInfo, &basicInfoCount) == KERN_SUCCESS) - - Of course, this doesn't gain us anything unless we start building the viewer as a 64-bit executable, since that's the only way - for our memory allocation to exceed 2^32. -*/ - // if (sysctl(ctl, 2, &page_size, &size, NULL, 0) == -1) // { // LL_WARNS() << "Couldn't get page size" << LL_ENDL; @@ -307,16 +287,15 @@ U32 LLMemory::getWorkingSetSize() U64 LLMemory::getCurrentRSS() { U64 residentSize = 0; - task_basic_info_data_t basicInfo; - mach_msg_type_number_t basicInfoCount = TASK_BASIC_INFO_COUNT; - if (task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&basicInfo, &basicInfoCount) == KERN_SUCCESS) + mach_task_basic_info_data_t basicInfo; + mach_msg_type_number_t basicInfoCount = MACH_TASK_BASIC_INFO_COUNT; + if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&basicInfo, &basicInfoCount) == KERN_SUCCESS) { - residentSize = basicInfo.resident_size; - - // If we ever wanted it, the process virtual size is also available as: - // virtualSize = basicInfo.virtual_size; - -// LL_INFOS() << "resident size is " << residentSize << LL_ENDL; +// residentSize = basicInfo.resident_size; + // Although this method is defined to return the "resident set size," + // in fact what callers want from it is the total virtual memory + // consumed by the application. + residentSize = basicInfo.virtual_size; } else { @@ -326,11 +305,6 @@ U64 LLMemory::getCurrentRSS() return residentSize; } -U32 LLMemory::getWorkingSetSize() -{ - return 0 ; -} - #elif defined(LL_LINUX) U64 LLMemory::getCurrentRSS() @@ -342,7 +316,7 @@ U64 LLMemory::getCurrentRSS() if (fp == NULL) { LL_WARNS() << "couldn't open " << statPath << LL_ENDL; - goto bail; + return rss; } // Eee-yew! See Documentation/filesystems/proc.txt in your @@ -361,49 +335,8 @@ U64 LLMemory::getCurrentRSS() fclose(fp); -bail: return rss; } - -U32 LLMemory::getWorkingSetSize() -{ - return 0 ; -} - -#elif LL_SOLARIS -#include -#include -#include -#define _STRUCTURED_PROC 1 -#include - -U64 LLMemory::getCurrentRSS() -{ - char path [LL_MAX_PATH]; /* Flawfinder: ignore */ - - sprintf(path, "/proc/%d/psinfo", (int)getpid()); - int proc_fd = -1; - if((proc_fd = open(path, O_RDONLY)) == -1){ - LL_WARNS() << "LLmemory::getCurrentRSS() unable to open " << path << ". Returning 0 RSS!" << LL_ENDL; - return 0; - } - psinfo_t proc_psinfo; - if(read(proc_fd, &proc_psinfo, sizeof(psinfo_t)) != sizeof(psinfo_t)){ - LL_WARNS() << "LLmemory::getCurrentRSS() Unable to read from " << path << ". Returning 0 RSS!" << LL_ENDL; - close(proc_fd); - return 0; - } - - close(proc_fd); - - return((U64)proc_psinfo.pr_rssize * 1024); -} - -U32 LLMemory::getWorkingSetSize() -{ - return 0 ; -} - #else U64 LLMemory::getCurrentRSS() @@ -411,11 +344,6 @@ U64 LLMemory::getCurrentRSS() return 0; } -U32 LLMemory::getWorkingSetSize() -{ - return 0; -} - #endif //-------------------------------------------------------------------------------------------------- @@ -427,7 +355,7 @@ LLMemTracker* LLMemTracker::sInstance = NULL ; LLMemTracker::LLMemTracker() { - mLastAllocatedMem = LLMemory::getWorkingSetSize() ; + mLastAllocatedMem = LLMemory::getCurrentRSS() ; mCapacity = 128 ; mCurIndex = 0 ; mCounter = 0 ; @@ -480,7 +408,7 @@ void LLMemTracker::track(const char* function, const int line) return ; } - U32 allocated_mem = LLMemory::getWorkingSetSize() ; + U64 allocated_mem = LLMemory::getCurrentRSS() ; LLMutexLock lock(mMutexp) ; diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index efd61590a..18af01f65 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -133,11 +133,15 @@ template T* LL_NEXT_ALIGNED_ADDRESS_64(T* address) #if defined(LL_WINDOWS) return _aligned_malloc(size, align); #else + char* aligned = NULL; void* mem = malloc( size + (align - 1) + sizeof(void*) ); - char* aligned = ((char*)mem) + sizeof(void*); - aligned += align - ((uintptr_t)aligned & (align - 1)); + if (mem) + { + aligned = ((char*)mem) + sizeof(void*); + aligned += align - ((uintptr_t)aligned & (align - 1)); - ((void**)aligned)[-1] = mem; + ((void**)aligned)[-1] = mem; + } return aligned; #endif } @@ -365,7 +369,6 @@ public: // Return the resident set size of the current process, in bytes. // Return value is zero if not known. static U64 getCurrentRSS(); - static U32 getWorkingSetSize(); static void* tryToAlloc(void* address, U32 size); static void initMaxHeapSizeGB(F32Gigabytes max_heap_size, BOOL prevent_heap_failure); static void updateMemoryInfo() ; diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index c1249984f..ba69408a7 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -702,28 +702,10 @@ LLMemoryInfo::LLMemoryInfo() refresh(); } -#if LL_WINDOWS -static U32Kilobytes LLMemoryAdjustKBResult(U32Kilobytes inKB) -{ - // Moved this here from llfloaterabout.cpp - - //! \bug - // For some reason, the reported amount of memory is always wrong. - // The original adjustment assumes it's always off by one meg, however - // errors of as much as 2520 KB have been observed in the value - // returned from the GetMemoryStatusEx function. Here we keep the - // original adjustment from llfoaterabout.cpp until this can be - // fixed somehow. - inKB += U32Megabytes(1); - - return inKB; -} -#endif - U32Kilobytes LLMemoryInfo::getPhysicalMemoryKB() const { #if LL_WINDOWS - return LLMemoryAdjustKBResult(U32Kilobytes(mStatsMap["Total Physical KB"].asInteger())); + return U32Kilobytes(mStatsMap["Total Physical KB"].asInteger()); #elif LL_DARWIN // This might work on Linux as well. Someone check... @@ -740,43 +722,22 @@ U32Kilobytes LLMemoryInfo::getPhysicalMemoryKB() const phys = (U64)(getpagesize()) * (U64)(get_phys_pages()); return U64Bytes(phys); -#elif LL_SOLARIS - U64 phys = 0; - phys = (U64)(getpagesize()) * (U64)(sysconf(_SC_PHYS_PAGES)); - return U64Bytes(phys); - #else return 0; #endif } -U32Bytes LLMemoryInfo::getPhysicalMemoryClamped() const -{ - // Return the total physical memory in bytes, but clamp it - // to no more than U32_MAX - - U32Kilobytes phys_kb = getPhysicalMemoryKB(); - if (phys_kb >= U32Gigabytes(4)) - { - return U32Bytes(U32_MAX); - } - else - { - return phys_kb; - } -} - //static void LLMemoryInfo::getAvailableMemoryKB(U32Kilobytes& avail_physical_mem_kb, U32Kilobytes& avail_virtual_mem_kb) { #if LL_WINDOWS - // Sigh, this shouldn't be a static method, then we wouldn't have to - // reload this data separately from refresh() - LLSD statsMap(loadStatsMap()); + MEMORYSTATUSEX state; + state.dwLength = sizeof(state); + GlobalMemoryStatusEx(&state); - avail_physical_mem_kb = (U32Kilobytes)statsMap["Avail Physical KB"].asInteger(); - avail_virtual_mem_kb = (U32Kilobytes)statsMap["Avail Virtual KB"].asInteger(); + avail_physical_mem_kb = U64Bytes(state.ullAvailPhys); + avail_virtual_mem_kb = U64Bytes(state.ullAvailVirtual); #elif LL_DARWIN // mStatsMap is derived from vm_stat, look for (e.g.) "kb free": @@ -924,7 +885,7 @@ LLSD LLMemoryInfo::loadStatsMap() DWORDLONG div = 1024; - stats.add("Percent Memory use", state.dwMemoryLoad/div); + stats.add("Percent Memory use", state.dwMemoryLoad); stats.add("Total Physical KB", state.ullTotalPhys/div); stats.add("Avail Physical KB", state.ullAvailPhys/div); stats.add("Total page KB", state.ullTotalPageFile/div); @@ -973,27 +934,33 @@ LLSD LLMemoryInfo::loadStatsMap() stats.add("PrivateUsage KB", pmem.PrivateUsage/div); #elif LL_DARWIN - - const vm_size_t pagekb(vm_page_size / 1024); + vm_size_t page_size_kb; + if (host_page_size(mach_host_self(), &page_size_kb) != KERN_SUCCESS) + { + LL_WARNS() << "Unable to get host page size. Using default value." << LL_ENDL; + page_size_kb = 4096; + } + page_size_kb = page_size_kb / 1024; + // // Collect the vm_stat's // { - vm_statistics_data_t vmstat; - mach_msg_type_number_t vmstatCount = HOST_VM_INFO_COUNT; + vm_statistics64_data_t vmstat; + mach_msg_type_number_t vmstatCount = HOST_VM_INFO64_COUNT; - if (host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t) &vmstat, &vmstatCount) != KERN_SUCCESS) + if (host_statistics64(mach_host_self(), HOST_VM_INFO64, (host_info64_t) &vmstat, &vmstatCount) != KERN_SUCCESS) { LL_WARNS("LLMemoryInfo") << "Unable to collect memory information" << LL_ENDL; } else { - stats.add("Pages free KB", pagekb * vmstat.free_count); - stats.add("Pages active KB", pagekb * vmstat.active_count); - stats.add("Pages inactive KB", pagekb * vmstat.inactive_count); - stats.add("Pages wired KB", pagekb * vmstat.wire_count); + stats.add("Pages free KB", page_size_kb * vmstat.free_count); + stats.add("Pages active KB", page_size_kb * vmstat.active_count); + stats.add("Pages inactive KB", page_size_kb * vmstat.inactive_count); + stats.add("Pages wired KB", page_size_kb * vmstat.wire_count); stats.add("Pages zero fill", vmstat.zero_fill_count); stats.add("Page reactivations", vmstat.reactivations); @@ -1042,20 +1009,20 @@ LLSD LLMemoryInfo::loadStatsMap() // { - task_basic_info_64_data_t taskinfo; - unsigned taskinfoSize = sizeof(taskinfo); - - if (task_info(mach_task_self(), TASK_BASIC_INFO_64, (task_info_t) &taskinfo, &taskinfoSize) != KERN_SUCCESS) + mach_task_basic_info_data_t taskinfo; + mach_msg_type_number_t task_count = MACH_TASK_BASIC_INFO_COUNT; + if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t) &taskinfo, &task_count) != KERN_SUCCESS) { - LL_WARNS("LLMemoryInfo") << "Unable to collect task information" << LL_ENDL; - } - else - { - stats.add("Basic suspend count", taskinfo.suspend_count); - stats.add("Basic virtual memory KB", taskinfo.virtual_size / 1024); - stats.add("Basic resident memory KB", taskinfo.resident_size / 1024); - stats.add("Basic new thread policy", taskinfo.policy); - } + LL_WARNS("LLMemoryInfo") << "Unable to collect task information" << LL_ENDL; + } + else + { + stats.add("Basic virtual memory KB", taskinfo.virtual_size / 1024); + stats.add("Basic resident memory KB", taskinfo.resident_size / 1024); + stats.add("Basic max resident memory KB", taskinfo.resident_size_max / 1024); + stats.add("Basic new thread policy", taskinfo.policy); + stats.add("Basic suspend count", taskinfo.suspend_count); + } } #elif LL_SOLARIS diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h index accdbb5d2..d96319941 100644 --- a/indra/llcommon/llsys.h +++ b/indra/llcommon/llsys.h @@ -114,11 +114,6 @@ public: U32Kilobytes getPhysicalMemoryKB() const; - /*! Memory size in bytes, if total memory is >= 4GB then U32_MAX will - ** be returned. - */ - U32Bytes getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes - //get the available memory infomation in KiloBytes. static void getAvailableMemoryKB(U32Kilobytes& avail_physical_mem_kb, U32Kilobytes& avail_virtual_mem_kb); diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index bbeb286a0..aa368032d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -990,7 +990,7 @@ bool LLAppViewer::init() minSpecs += "\n"; unsupported = true; } - if(gSysMemory.getPhysicalMemoryClamped() < minRAM) + if(gSysMemory.getPhysicalMemoryKB() < minRAM) { minSpecs += LLNotificationTemplates::instance().getGlobalString("UnsupportedRAM"); minSpecs += "\n"; @@ -2692,8 +2692,8 @@ void LLAppViewer::writeSystemInfo() gDebugInfo["CPUInfo"]["CPUSSE"] = gSysCPU.hasSSE(); gDebugInfo["CPUInfo"]["CPUSSE2"] = gSysCPU.hasSSE2(); - gDebugInfo["RAMInfo"]["Physical"] = (LLSD::Integer)(gSysMemory.getPhysicalMemoryKB().value()); - gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer)(gMemoryAllocated.valueInUnits()); + gDebugInfo["RAMInfo"]["Physical"] = LLSD::Integer(gSysMemory.getPhysicalMemoryKB().value()); + gDebugInfo["RAMInfo"]["Allocated"] = LLSD::Integer(gMemoryAllocated.valueInUnits()); gDebugInfo["OSInfo"] = getOSInfo().getOSStringSimple(); // The user is not logged on yet, but record the current grid choice login url diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 096df5cde..8ecf9f8c6 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -679,7 +679,7 @@ void LLFeatureManager::applyBaseMasks() maskFeatures(gpustr); // now mask cpu type ones - if (gSysMemory.getPhysicalMemoryClamped() <= U32Megabytes(256)) + if (gSysMemory.getPhysicalMemoryKB() <= U32Megabytes(256)) { maskFeatures("RAM256MB"); } diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 5aa8239d4..6d694ca3b 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -238,9 +238,9 @@ void display_stats() F32 mem_log_freq = gSavedSettings.getF32("MemoryLogFrequency"); if (mem_log_freq > 0.f && gRecentMemoryTime.getElapsedTimeF32() >= mem_log_freq) { - gMemoryAllocated = (U64Bytes)LLMemory::getCurrentRSS(); + gMemoryAllocated = U64Bytes(LLMemory::getCurrentRSS()); U32Megabytes memory = gMemoryAllocated; - LL_INFOS() << llformat("MEMORY: %d MB", memory.value()) << LL_ENDL; + LL_INFOS() << "MEMORY: " << memory << LL_ENDL; LL_INFOS() << "THREADS: "<< LLThread::getCount() << LL_ENDL; LL_INFOS() << "MALLOC: " << SGMemStat::getPrintableStat() < LLViewerTextureList::convertToUploadFile(LLPointer S32Megabytes(1500)) ? S32Megabytes(64) : gMinVideoRam ; } @@ -1325,15 +1325,15 @@ S32Megabytes LLViewerTextureList::getMaxVideoRamSetting(bool get_recommended, fl { if (!get_recommended) { - max_texmem = (S32Megabytes)512; + max_texmem = S32Megabytes(512); } else if (gSavedSettings.getBOOL("NoHardwareProbe")) //did not do hardware detection at startup { - max_texmem = (S32Megabytes)512; + max_texmem = S32Megabytes(512); } else { - max_texmem = (S32Megabytes)128; + max_texmem = S32Megabytes(128); } LL_WARNS() << "VRAM amount not detected, defaulting to " << max_texmem << " MB" << LL_ENDL; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 5854038ab..608a4529a 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -385,7 +385,7 @@ public: static const LLCachedControl debug_show_memory("DebugShowMemory"); if (debug_show_memory) { - addText(xpos, ypos, llformat("Memory: %d (KB)", LLMemory::getWorkingSetSize() / 1024)); + addText(xpos, ypos, llformat("Memory: %d (KB)", LLMemory::getCurrentRSS() / 1024)); ypos += y_inc; } #endif From f5ffa65ea7737d1be72024f59d1fa6c160b19111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 17:06:07 -0400 Subject: [PATCH 09/66] Merge Line Editor menu and Text Editor menu, and use EditMenu listeners Cleans up a ton of logic and some excess memory usage Translates Line Editor menu, finally --- indra/llui/lllineeditor.cpp | 45 +------------------ indra/llui/lllineeditor.h | 5 --- indra/llui/lltexteditor.cpp | 23 +++++----- .../default/xui/en-us/menu_texteditor.xml | 19 +++++--- 4 files changed, 27 insertions(+), 65 deletions(-) diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index b6279a468..9916c9465 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -178,18 +178,9 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect, sImage = LLUI::getUIImage("sm_rounded_corners_simple.tga"); } mImage = sImage; + // make the popup menu available - //LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_texteditor.xml", parent_view); - LLMenuGL* menu = new LLMenuGL("wot"); - /*if (!menu) - { - menu = new LLMenuGL(LLStringUtil::null); - }*/ - menu->addChild(new LLMenuItemCallGL("Cut", context_cut, NULL, this)); - menu->addChild(new LLMenuItemCallGL("Copy", context_copy, NULL, this)); - menu->addChild(new LLMenuItemCallGL("Paste", context_paste, NULL, this)); - menu->addChild(new LLMenuItemCallGL("Delete", context_delete, NULL, this)); - menu->addChild(new LLMenuItemCallGL("Select All", context_selectall, NULL, this)); + LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_texteditor.xml", LLMenuGL::sMenuContainer); menu->addSeparator(); //menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor")); menu->setCanTearOff(FALSE); @@ -452,18 +443,6 @@ void LLLineEditor::deselect() } -void LLLineEditor::context_cut(void* data) -{ - LLLineEditor* line = (LLLineEditor*)data; - if(line)line->cut(); -} -void LLLineEditor::context_copy(void* data) -{ - LLLineEditor* line = (LLLineEditor*)data; - if(line)line->copy(); -} - - void LLLineEditor::spell_correct(void* data) { SpellMenuBind* tempBind = (SpellMenuBind*)data; @@ -545,25 +524,6 @@ void LLLineEditor::spell_add(void* data) } } - -void LLLineEditor::context_paste(void* data) -{ - LLLineEditor* line = (LLLineEditor*)data; - if(line)line->paste(); -} - -void LLLineEditor::context_delete(void* data) -{ - LLLineEditor* line = (LLLineEditor*)data; - if(line)line->doDelete(); -} - -void LLLineEditor::context_selectall(void* data) -{ - LLLineEditor* line = (LLLineEditor*)data; - if(line)line->selectAll(); -} - void LLLineEditor::startSelection() { mIsSelecting = TRUE; @@ -3113,7 +3073,6 @@ void LLLineEditor::showContextMenu(S32 x, S32 y) tempStruct->wordPositionStart=wordStart; LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL( tempStruct->word, spell_correct, NULL, tempStruct); - //new LLMenuItemCallGL("Select All", context_selectall, NULL, this)); tempStruct->menuItem = suggMenuItem; suggestionMenuItems.push_back(tempStruct); menu->addChild(suggMenuItem); diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index 23cb6333a..c6712b7cf 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -137,11 +137,6 @@ public: virtual void deselect(); virtual BOOL canDeselect() const; - static void context_cut(void* data); - static void context_copy(void* data); - static void context_paste(void* data); - static void context_delete(void* data); - static void context_selectall(void* data); static void spell_correct(void* data); static void spell_show(void* data); static void spell_add(void* data); diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 2e1c70baf..d58249de0 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -397,18 +397,20 @@ static LLTextEditor* get_focused_text_editor() return te; } -class ContextText : public LLMemberListener +class CopyRawText : public LLMemberListener { bool handleEvent(LLPointer, const LLSD& userdata) override { - auto text = get_focused_text_editor(); - const auto& op = userdata.asStringRef(); - if (op == "Cut") text->cut(); - else if (op == "Copy") text->copy(); - else if (op == "CopyRaw") text->copyRaw(); - else if (op == "Paste") text->paste(); - else if (op == "Delete") text->doDelete(); - else if (op == "SelectAll") text->selectAll(); + get_focused_text_editor()->copyRaw(); + return true; + } +}; + +class TextEditorVisible : public LLMemberListener +{ + bool handleEvent(LLPointer, const LLSD& userdata) override + { + LLMenuGL::sMenuContainer->findControl(userdata["control"].asString())->setValue(!!dynamic_cast(gFocusMgr.getKeyboardFocus())); return true; } }; @@ -583,7 +585,8 @@ void LLTextEditor::spell_add(void* data) //static void LLTextEditor::addMenuListeners(ext_slurl_cb cb, ext_slurl_visible_cb vcb) { - (new ContextText)->registerListener(LLMenuGL::sMenuContainer, "Text"); + (new CopyRawText)->registerListener(LLMenuGL::sMenuContainer, "CopyRawText"); + (new TextEditorVisible)->registerListener(LLMenuGL::sMenuContainer, "TextEditorVisible"); (new ContextUrl)->registerListener(LLMenuGL::sMenuContainer, "Text.Url"); (new ContextUrlCopy)->registerListener(LLMenuGL::sMenuContainer, "Text.Url.CopyUUID"); (new ContextUrlExt(cb))->registerListener(LLMenuGL::sMenuContainer, "Text.Url.Ext"); diff --git a/indra/newview/skins/default/xui/en-us/menu_texteditor.xml b/indra/newview/skins/default/xui/en-us/menu_texteditor.xml index 425eef2d4..8292d8d91 100644 --- a/indra/newview/skins/default/xui/en-us/menu_texteditor.xml +++ b/indra/newview/skins/default/xui/en-us/menu_texteditor.xml @@ -1,21 +1,26 @@ - + - + + - + + - + + - + + - + + - + From 98b3c8a812b7e5edd0d217d34695e028340a551b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 17:22:31 -0400 Subject: [PATCH 10/66] These are not name editors, they are line editors. Get it right. --- indra/newview/skins/default/xui/en-us/panel_avatar.xml | 2 +- indra/newview/skins/default/xui/en-us/panel_group_general.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml index f85b49b3f..3259a1c7f 100644 --- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml +++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml @@ -12,7 +12,7 @@ - Group Key: - Date: Wed, 9 Oct 2019 17:23:41 -0400 Subject: [PATCH 11/66] When a profile is being reused, disable partner info button --- indra/newview/llpanelavatar.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index c1820c5bd..638db97a0 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -169,6 +169,8 @@ void LLPanelAvatarSecondLife::clearControls() childSetTextArg("partner_edit", "[NAME]", LLStringUtil::null); mPartnerID = LLUUID::null; + if (LLUICtrl* ctrl = getChild("partner_info")) + ctrl->setEnabled(mPartnerID.notNull()); getChild("groups")->deleteAllItems(); } From f80e23ac5e54f249bd494f7c0771c2644854a75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 17:30:27 -0400 Subject: [PATCH 12/66] Name Editors are Name UI too! --- indra/newview/llnameeditor.cpp | 106 ++++++++++++--------------------- indra/newview/llnameeditor.h | 39 ++++-------- 2 files changed, 47 insertions(+), 98 deletions(-) diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp index d7c948d36..e9ec70666 100644 --- a/indra/newview/llnameeditor.cpp +++ b/indra/newview/llnameeditor.cpp @@ -34,80 +34,49 @@ #include "llnameeditor.h" #include "llcachename.h" -#include "llagent.h" - -#include "llfontgl.h" - -#include "lluuid.h" -#include "llrect.h" -#include "llstring.h" -#include "llui.h" +#include "llmenugl.h" +#include "lluictrlfactory.h" static LLRegisterWidget r("name_editor"); -// statics -std::set LLNameEditor::sInstances; - LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect, - const LLUUID& name_id, - BOOL is_group, + const LLUUID& name_id, + bool is_group, + const std::string& loading, const LLFontGL* glfont, S32 max_text_length) -: LLLineEditor(name, rect, - std::string("(retrieving)"), - glfont, - max_text_length), - mNameID(name_id) +: LLNameUI(loading, name_id, is_group) +, LLLineEditor(name, rect, LLStringUtil::null, glfont, max_text_length) { - LLNameEditor::sInstances.insert(this); - if(!name_id.isNull()) + if (!name_id.isNull()) { setNameID(name_id, is_group); } + else setText(mInitialValue); } - -LLNameEditor::~LLNameEditor() +// virtual +BOOL LLNameEditor::handleRightMouseDown(S32 x, S32 y, MASK mask) { - LLNameEditor::sInstances.erase(this); + bool simple_menu = mContextMenuHandle.get()->getName() != "rclickmenu"; + std::string new_menu; + // Singu TODO: Generic menus for groups + if ((mIsGroup || mNameID.isNull()) && simple_menu) + { + new_menu = "menu_texteditor.xml"; + } + else if (!simple_menu && !mIsGroup) + { + new_menu = "menu_nameeditor_avatar.xml"; + } + if (!new_menu.empty()) setContextMenu(LLUICtrlFactory::instance().buildMenu(new_menu, LLMenuGL::sMenuContainer)); + + return LLLineEditor::handleRightMouseDown(x, y, mask); } -void LLNameEditor::setNameID(const LLUUID& name_id, BOOL is_group) +void LLNameEditor::setText(const std::string& text) { - mNameID = name_id; - - std::string name; - - if (!is_group) - { - gCacheName->getFullName(name_id, name); - } - else - { - gCacheName->getGroupName(name_id, name); - } - - setText(name); -} - -void LLNameEditor::refresh(const LLUUID& id, const std::string& full_name, bool is_group) -{ - if (id == mNameID) - { - setText(full_name); - } -} - -void LLNameEditor::refreshAll(const LLUUID& id, const std::string& full_name, bool is_group) -{ - std::set::iterator it; - for (it = LLNameEditor::sInstances.begin(); - it != LLNameEditor::sInstances.end(); - ++it) - { - LLNameEditor* box = *it; - box->refresh(id, full_name, is_group); - } + LLLineEditor::setText(text); } void LLNameEditor::setValue( const LLSD& value ) @@ -135,22 +104,21 @@ LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory LLRect rect; createRect(node, rect, parent, LLRect()); - S32 max_text_length = 128; + S32 max_text_length = 1024; node->getAttributeS32("max_length", max_text_length); - - LLFontGL* font = LLView::selectFont(node); + bool is_group = false; + node->getAttribute_bool("is_group", is_group); + LLUUID id; + node->getAttributeUUID("id", id); + std::string loading; + node->getAttributeString("label", loading); LLNameEditor* line_editor = new LLNameEditor("name_editor", - rect, - LLUUID::null, FALSE, - font, + rect, + id, is_group, loading, + LLView::selectFont(node), max_text_length); - std::string label; - if(node->getAttributeString("label", label)) - { - line_editor->setLabel(label); - } line_editor->setColorParameters(node); line_editor->initFromXML(node, parent); diff --git a/indra/newview/llnameeditor.h b/indra/newview/llnameeditor.h index 6ac6e4538..2a66daa20 100644 --- a/indra/newview/llnameeditor.h +++ b/indra/newview/llnameeditor.h @@ -33,50 +33,31 @@ #ifndef LL_LLNAMEEDITOR_H #define LL_LLNAMEEDITOR_H -#include - -#include "llview.h" -#include "v4color.h" -#include "llstring.h" -#include "llfontgl.h" #include "lllineeditor.h" - +#include "llnameui.h" class LLNameEditor : public LLLineEditor +, public LLNameUI { public: LLNameEditor(const std::string& name, const LLRect& rect, const LLUUID& name_id = LLUUID::null, - BOOL is_group = FALSE, - const LLFontGL* glfont = NULL, + bool is_group = false, + const std::string& loading = LLStringUtil::null, + const LLFontGL* glfont = nullptr, S32 max_text_length = 254); - // By default, follows top and left and is mouse-opaque. - // If no text, text = name. - // If no font, uses default system font. - virtual ~LLNameEditor(); + BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override final; - virtual LLXMLNodePtr getXML(bool save_children = true) const; + LLXMLNodePtr getXML(bool save_children = true) const override final; static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); - void setNameID(const LLUUID& name_id, BOOL is_group); - - void refresh(const LLUUID& id, const std::string& full_name, bool is_group); - - static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group); - - // Take/return agent UUIDs - virtual void setValue( const LLSD& value ); - virtual LLSD getValue() const; - -private: - static std::set sInstances; - -private: - LLUUID mNameID; + void setValue(const LLSD& value) override final; + LLSD getValue() const override final; + void setText(const std::string& text) override final; }; #endif From 11068eee381168b93fbf9be55350ae3c3dce8ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 17:42:05 -0400 Subject: [PATCH 13/66] Woops, these are needed since the change of name to line editor --- indra/newview/llpanelavatar.cpp | 5 ++--- indra/newview/llpanelgroupgeneral.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 638db97a0..6e7f95a24 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -1297,9 +1297,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id) mCacheConnection.disconnect(); mCacheConnection = LLAvatarNameCache::get(avatar_id, boost::bind(&LLPanelAvatar::onAvatarNameResponse, this, _1, _2)); - LLNameEditor* key_edit = getChild("avatar_key"); - if (key_edit) - key_edit->setText(mAvatarID.asString()); + if (auto key_edit = getChildView("avatar_key")) + key_edit->setValue(mAvatarID.asString()); // While we're waiting for data off the network, clear out the old data. if (mPanelSecondLife) diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index 4379ff3e1..eeccea15e 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -736,10 +736,9 @@ void LLPanelGroupGeneral::update(LLGroupChange gc) if (mGroupNameEditor) mGroupNameEditor->setVisible(FALSE); if (mFounderName) mFounderName->setNameID(gdatap->mFounderID,FALSE); - LLNameEditor* key_edit = getChild("group_key"); - if(key_edit) + if (auto key_edit = getChildView("group_key")) { - key_edit->setText(gdatap->getID().asString()); + key_edit->setValue(gdatap->getID().asString()); } if (mInsignia) From ab546f54ab159b8808d6a2492767f169a88cd2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 17:43:26 -0400 Subject: [PATCH 14/66] Remove unnecessary function --- indra/newview/llpanelavatar.cpp | 2 +- indra/newview/llpanelavatar.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 6e7f95a24..a5d0b2f87 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -216,7 +216,7 @@ void LLPanelAvatarSecondLife::processProperties(void* data, EAvatarProcessorType bool allow_publish = (pAvatarData->flags & AVATAR_ALLOW_PUBLISH); childSetValue("allow_publish", allow_publish); - setPartnerID(pAvatarData->partner_id); + mPartnerID = pAvatarData->partner_id; if (mPartnerID.notNull()) { mCacheConnection.disconnect(); diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h index cc6e10b51..022b37641 100644 --- a/indra/newview/llpanelavatar.h +++ b/indra/newview/llpanelavatar.h @@ -121,8 +121,6 @@ public: void updateOnlineText(BOOL online, BOOL have_calling_card); void updatePartnerName(const LLAvatarName& name); - void setPartnerID(LLUUID id) { mPartnerID = id; } - private: LLUUID mPartnerID; boost::signals2::connection mCacheConnection; From 6cd07b23f12c6fb39dec7c427e6e2f6f70b23feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 17:44:31 -0400 Subject: [PATCH 15/66] Name Editors sometimes need to be scrolled through, show tooltip instead --- indra/newview/llnameeditor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp index e9ec70666..4f0ddc44e 100644 --- a/indra/newview/llnameeditor.cpp +++ b/indra/newview/llnameeditor.cpp @@ -76,6 +76,7 @@ BOOL LLNameEditor::handleRightMouseDown(S32 x, S32 y, MASK mask) void LLNameEditor::setText(const std::string& text) { + setToolTip(text); LLLineEditor::setText(text); } From c18bdddb609b8d33012b906964ec87a09caf21e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 17:57:10 -0400 Subject: [PATCH 16/66] Woops, forgot to stage this file! --- indra/newview/llstartup.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 8c401241d..add23140c 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -205,7 +205,6 @@ #include "llvoiceclient.h" #include "llnamelistctrl.h" #include "llnameui.h" -#include "llnameeditor.h" #include "llwlparammanager.h" #include "llwaterparammanager.h" #include "llagentlanguage.h" @@ -321,7 +320,6 @@ void transition_back_to_login_panel(const std::string& emsg); void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is_group) { LLNameUI::refreshAll(id, full_name, is_group); - LLNameEditor::refreshAll(id, full_name, is_group); // TODO: Actually be intelligent about the refresh. // For now, just brute force refresh the dialogs. From b132578692d7737f4fc641567568c327d4436eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 20:03:26 -0400 Subject: [PATCH 17/66] Bit of refactor in prep for bigger changes --- indra/newview/llnameui.cpp | 17 ++++++++++------- indra/newview/llnameui.h | 1 + 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/indra/newview/llnameui.cpp b/indra/newview/llnameui.cpp index b0426c684..e1cd63491 100644 --- a/indra/newview/llnameui.cpp +++ b/indra/newview/llnameui.cpp @@ -39,8 +39,8 @@ std::set LLNameUI::sInstances; LLNameUI::LLNameUI(const std::string& loading, const LLUUID& id, bool is_group) - : mInitialValue(!loading.empty() ? loading : LLTrans::getString("LoadingData")) - , mNameID(id), mIsGroup(is_group) +: mNameID(id), mIsGroup(is_group) +, mInitialValue(!loading.empty() ? loading : LLTrans::getString("LoadingData")) { sInstances.insert(this); } @@ -48,20 +48,23 @@ LLNameUI::LLNameUI(const std::string& loading, const LLUUID& id, bool is_group) void LLNameUI::setNameID(const LLUUID& name_id, bool is_group) { mNameID = name_id; + mIsGroup = is_group; + setNameText(); +void LLNameUI::setNameText() +{ std::string name; bool got_name = false; - if (!is_group) + if (mIsGroup) { - got_name = gCacheName->getFullName(name_id, name); + got_name = gCacheName->getGroupName(mNameID, name); } else { - got_name = gCacheName->getGroupName(name_id, name); + got_name = gCacheName->getFullName(mNameID, name); } - mIsGroup = is_group; // Got the name already? Set it. // Otherwise it will be set later in refresh(). @@ -72,7 +75,7 @@ void LLNameUI::refresh(const LLUUID& id, const std::string& full_name, bool is_g { if (id == mNameID) { - setText(full_name); + setNameText(); } } diff --git a/indra/newview/llnameui.h b/indra/newview/llnameui.h index 50d621032..f5825d6ca 100644 --- a/indra/newview/llnameui.h +++ b/indra/newview/llnameui.h @@ -46,6 +46,7 @@ struct LLNameUI : public LFIDBearer S32 getNumSelected() const override final { return 1; } void setNameID(const LLUUID& name_id, bool is_group); + void setNameText(); // Sets the name to whatever the name cache has at the moment void refresh(const LLUUID& id, const std::string& full_name, bool is_group); static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group); From 0b7061afb704d5a7b8c84e8cebf53258548a19ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 20:07:29 -0400 Subject: [PATCH 18/66] Name UI flag to disallow user interaction Also bypass setting name text for null ID --- indra/newview/llnamebox.cpp | 4 ++++ indra/newview/llnameeditor.cpp | 2 ++ indra/newview/llnameui.cpp | 8 ++++++-- indra/newview/llnameui.h | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp index a94247609..930f62f6a 100644 --- a/indra/newview/llnamebox.cpp +++ b/indra/newview/llnamebox.cpp @@ -50,6 +50,8 @@ LLNameBox::LLNameBox(const std::string& name) void LLNameBox::showProfile() { + if (!mAllowInteract) return; + if (mIsGroup) LLGroupActions::show(mNameID); else @@ -59,6 +61,8 @@ void LLNameBox::showProfile() // virtual BOOL LLNameBox::handleRightMouseDown(S32 x, S32 y, MASK mask) { + if (!mAllowInteract) return; + if (!LLTextBox::handleRightMouseDown(x, y, mask)) { // Singu TODO: Generic menus for groups diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp index 4f0ddc44e..d023d6f49 100644 --- a/indra/newview/llnameeditor.cpp +++ b/indra/newview/llnameeditor.cpp @@ -58,6 +58,8 @@ LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect, // virtual BOOL LLNameEditor::handleRightMouseDown(S32 x, S32 y, MASK mask) { + if (!mAllowInteract) return; + bool simple_menu = mContextMenuHandle.get()->getName() != "rclickmenu"; std::string new_menu; // Singu TODO: Generic menus for groups diff --git a/indra/newview/llnameui.cpp b/indra/newview/llnameui.cpp index e1cd63491..cd9ff731f 100644 --- a/indra/newview/llnameui.cpp +++ b/indra/newview/llnameui.cpp @@ -39,7 +39,7 @@ std::set LLNameUI::sInstances; LLNameUI::LLNameUI(const std::string& loading, const LLUUID& id, bool is_group) -: mNameID(id), mIsGroup(is_group) +: mNameID(id), mIsGroup(is_group), mAllowInteract(false) , mInitialValue(!loading.empty() ? loading : LLTrans::getString("LoadingData")) { sInstances.insert(this); @@ -49,7 +49,11 @@ void LLNameUI::setNameID(const LLUUID& name_id, bool is_group) { mNameID = name_id; mIsGroup = is_group; - setNameText(); + if (mAllowInteract = mNameID.notNull()) + setNameText(); + else + setText(LLTrans::getString(mIsGroup ? "GroupNameNone" : "AvatarNameNobody")); +} void LLNameUI::setNameText() { diff --git a/indra/newview/llnameui.h b/indra/newview/llnameui.h index f5825d6ca..e10814f23 100644 --- a/indra/newview/llnameui.h +++ b/indra/newview/llnameui.h @@ -58,5 +58,6 @@ private: protected: LLUUID mNameID; bool mIsGroup; + bool mAllowInteract; std::string mInitialValue; }; \ No newline at end of file From b1be8bb7f3bcc16ae523ce9670517f3a9567f9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 20:13:16 -0400 Subject: [PATCH 19/66] Clean up a section of RLVa code --- indra/newview/rlvcommon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp index c3dc38ebe..7410c5897 100644 --- a/indra/newview/rlvcommon.cpp +++ b/indra/newview/rlvcommon.cpp @@ -462,8 +462,8 @@ bool RlvUtil::isNearbyAgent(const LLUUID& idAgent) uuid_vec_t idAgents; LLWorld::getInstance()->getAvatars(&idAgents, NULL); - for (int idxAgent = 0, cntAgent = idAgents.size(); idxAgent < cntAgent; idxAgent++) - if (idAgents[idxAgent] == idAgent) + for (const auto& id : idAgents) + if (id == idAgent) return true; } return false; From d54bf78c089175969e9566460c78fe4863b7a983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 20:35:16 -0400 Subject: [PATCH 20/66] Allow Name UI to be marked rlv_sensitive (via xui) This allows these parts of UI to be hidden when they need to be --- indra/newview/llnamebox.cpp | 1 + indra/newview/llnameeditor.cpp | 7 +++++-- indra/newview/llnameeditor.h | 1 + indra/newview/llnameui.cpp | 17 +++++++++++++++-- indra/newview/llnameui.h | 3 ++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp index 930f62f6a..cb59b6e32 100644 --- a/indra/newview/llnamebox.cpp +++ b/indra/newview/llnamebox.cpp @@ -79,6 +79,7 @@ void LLNameBox::initFromXML(LLXMLNodePtr node, LLView* parent) LLTextBox::initFromXML(node, parent); node->getAttributeString("initial_value", mInitialValue); setText(mInitialValue); + node->getAttribute_bool("rlv_sensitive", mRLVSensitive); } // static diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp index d023d6f49..a82a34dd8 100644 --- a/indra/newview/llnameeditor.cpp +++ b/indra/newview/llnameeditor.cpp @@ -43,9 +43,10 @@ LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect, const LLUUID& name_id, bool is_group, const std::string& loading, + bool rlv_sensitive, const LLFontGL* glfont, S32 max_text_length) -: LLNameUI(loading, name_id, is_group) +: LLNameUI(loading, rlv_sensitive, name_id, is_group) , LLLineEditor(name, rect, LLStringUtil::null, glfont, max_text_length) { if (!name_id.isNull()) @@ -115,10 +116,12 @@ LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory node->getAttributeUUID("id", id); std::string loading; node->getAttributeString("label", loading); + bool rlv_sensitive = false; + node->getAttribute_bool("rlv_sensitive", rlv_sensitive); LLNameEditor* line_editor = new LLNameEditor("name_editor", rect, - id, is_group, loading, + id, is_group, loading, rlv_sensitive, LLView::selectFont(node), max_text_length); diff --git a/indra/newview/llnameeditor.h b/indra/newview/llnameeditor.h index 2a66daa20..e7812927d 100644 --- a/indra/newview/llnameeditor.h +++ b/indra/newview/llnameeditor.h @@ -45,6 +45,7 @@ public: const LLUUID& name_id = LLUUID::null, bool is_group = false, const std::string& loading = LLStringUtil::null, + bool rlv_sensitive = false, const LLFontGL* glfont = nullptr, S32 max_text_length = 254); diff --git a/indra/newview/llnameui.cpp b/indra/newview/llnameui.cpp index cd9ff731f..8a05d0d2c 100644 --- a/indra/newview/llnameui.cpp +++ b/indra/newview/llnameui.cpp @@ -33,13 +33,16 @@ #include "llviewerprecompiledheaders.h" #include "llnameui.h" +#include "llagentdata.h" #include "lltrans.h" +#include "rlvhandler.h" + // statics std::set LLNameUI::sInstances; -LLNameUI::LLNameUI(const std::string& loading, const LLUUID& id, bool is_group) -: mNameID(id), mIsGroup(is_group), mAllowInteract(false) +LLNameUI::LLNameUI(const std::string& loading, bool rlv_sensitive, const LLUUID& id, bool is_group) +: mNameID(id), mRLVSensitive(rlv_sensitive), mIsGroup(is_group), mAllowInteract(false) , mInitialValue(!loading.empty() ? loading : LLTrans::getString("LoadingData")) { sInstances.insert(this); @@ -69,6 +72,16 @@ void LLNameUI::setNameText() got_name = gCacheName->getFullName(mNameID, name); } + if (!mIsGroup && got_name && mRLVSensitive) // Filter if needed + { + if ((gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) || gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMETAGS)) + && mNameID.notNull() && mNameID != gAgentID && RlvUtil::isNearbyAgent(mNameID)) + { + mAllowInteract = false; + name = RlvStrings::getAnonym(name); + } + else mAllowInteract = true; + } // Got the name already? Set it. // Otherwise it will be set later in refresh(). diff --git a/indra/newview/llnameui.h b/indra/newview/llnameui.h index e10814f23..599a31b8f 100644 --- a/indra/newview/llnameui.h +++ b/indra/newview/llnameui.h @@ -38,7 +38,7 @@ struct LLNameUI : public LFIDBearer { - LLNameUI(const std::string& loading = LLStringUtil::null, const LLUUID& id = LLUUID::null, bool is_group = false); + LLNameUI(const std::string& loading = LLStringUtil::null, bool rlv_sensitive = false, const LLUUID& id = LLUUID::null, bool is_group = false); virtual ~LLNameUI() { sInstances.erase(this); } LLUUID getStringUUIDSelectedItem() const override final { return mNameID; } @@ -57,6 +57,7 @@ private: protected: LLUUID mNameID; + bool mRLVSensitive; // Whether or not we're doing RLV filtering bool mIsGroup; bool mAllowInteract; std::string mInitialValue; From d277f1750d61576dec3d08480cbf950b2d42c59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 9 Oct 2019 23:57:01 -0400 Subject: [PATCH 21/66] All places just av/group names were being used are now name ui Since NameBoxes are clickable, remove redundant profile buttons. Removes a ton of RLV logic, now centralized inside LLNameUI Removes excess functions that went largely unused May no longer show if parcel sale is pending under the owner field, this is weird and it's hard to keep this behavior Also includes the missing setValue and getValue so this compiles, that should've been committed way earlier, oops Also adds ability for name_box to have is_group attribute, too! --- indra/newview/llfloaterbuyland.cpp | 12 +- indra/newview/llfloaterbuyland.h | 2 +- indra/newview/llfloaterland.cpp | 92 ++------- indra/newview/llfloaterland.h | 7 +- indra/newview/llfloaterproperties.cpp | 79 +------- indra/newview/llfloaterproperties.h | 3 - indra/newview/llfloaterregioninfo.cpp | 22 +- indra/newview/llfloaterregioninfo.h | 6 +- indra/newview/llnamebox.cpp | 1 + indra/newview/llnamebox.h | 2 + indra/newview/llnameeditor.cpp | 10 - indra/newview/llnameeditor.h | 5 +- indra/newview/llnameui.h | 11 + indra/newview/llpanelavatar.cpp | 28 +-- indra/newview/llpanelavatar.h | 4 - indra/newview/llpanelevent.cpp | 15 +- indra/newview/llpanelevent.h | 1 - indra/newview/llpanelgroupgeneral.cpp | 13 +- indra/newview/llpanelgroupgeneral.h | 1 - indra/newview/llpanelpermissions.cpp | 190 +++--------------- indra/newview/llpanelpermissions.h | 4 - indra/newview/llviewermessage.cpp | 15 +- .../default/xui/en-us/floater_about_land.xml | 27 +-- .../default/xui/en-us/floater_buy_land.xml | 4 +- .../floater_inventory_item_properties.xml | 27 +-- .../skins/default/xui/en-us/floater_tools.xml | 37 +--- .../skins/default/xui/en-us/panel_avatar.xml | 13 +- .../skins/default/xui/en-us/panel_event.xml | 4 +- .../default/xui/en-us/panel_group_general.xml | 6 +- .../xui/en-us/panel_region_covenant.xml | 4 +- .../default/xui/en-us/panel_region_estate.xml | 4 +- 31 files changed, 151 insertions(+), 498 deletions(-) diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp index a890cba38..080a74a48 100644 --- a/indra/newview/llfloaterbuyland.cpp +++ b/indra/newview/llfloaterbuyland.cpp @@ -176,7 +176,7 @@ public: void updateFloaterCovenantText(const std::string& string, const LLUUID &asset_id); void updateFloaterEstateName(const std::string& name); void updateFloaterLastModified(const std::string& text); - void updateFloaterEstateOwnerName(const std::string& name); + void updateFloaterEstateOwnerID(const LLUUID& id); void updateWebSiteInfo(); void finishWebSiteInfo(); @@ -263,12 +263,12 @@ void LLFloaterBuyLand::updateLastModified(const std::string& text) } // static -void LLFloaterBuyLand::updateEstateOwnerName(const std::string& name) +void LLFloaterBuyLand::updateEstateOwnerID(const LLUUID& id) { - LLFloaterBuyLandUI* floater = LLFloaterBuyLandUI::instanceExists() ? LLFloaterBuyLandUI::getInstance() : NULL; + LLFloaterBuyLandUI* floater = LLFloaterBuyLandUI::instanceExists() ? LLFloaterBuyLandUI::getInstance() : nullptr; if (floater) { - floater->updateFloaterEstateOwnerName(name); + floater->updateFloaterEstateOwnerID(id); } } @@ -629,10 +629,10 @@ void LLFloaterBuyLandUI::updateFloaterLastModified(const std::string& text) if (editor) editor->setText(text); } -void LLFloaterBuyLandUI::updateFloaterEstateOwnerName(const std::string& name) +void LLFloaterBuyLandUI::updateFloaterEstateOwnerID(const LLUUID& id) { LLTextBox* box = getChild("estate_owner_text"); - if (box) box->setText(name); + if (box) box->setValue(id); } void LLFloaterBuyLandUI::updateWebSiteInfo() diff --git a/indra/newview/llfloaterbuyland.h b/indra/newview/llfloaterbuyland.h index 0d90130a0..8bb98e0c2 100644 --- a/indra/newview/llfloaterbuyland.h +++ b/indra/newview/llfloaterbuyland.h @@ -46,7 +46,7 @@ public: static void updateCovenantText(const std::string& string, const LLUUID& asset_id); static void updateEstateName(const std::string& name); static void updateLastModified(const std::string& text); - static void updateEstateOwnerName(const std::string& name); + static void updateEstateOwnerID(const LLUUID& id); }; #endif diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 59f2b5049..fee645546 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -368,7 +368,6 @@ LLPanelLandGeneral::LLPanelLandGeneral(LLParcelSelectionHandle& parcel) , mBtnDeedToGroup(nullptr) , mBtnSetGroup(nullptr) , mTextOwner(nullptr) - , mBtnProfile(nullptr) , mContentRating(nullptr) , mLandType(nullptr) , mTextGroup(nullptr) @@ -414,19 +413,13 @@ BOOL LLPanelLandGeneral::postBuild() mContentRating = getChild("ContentRatingText"); mLandType = getChild("LandTypeText"); - - mBtnProfile = getChild("Profile..."); - mBtnProfile->setClickedCallback(boost::bind(&LLPanelLandGeneral::onClickProfile, this)); - mTextGroup = getChild("GroupText"); mBtnSetGroup = getChild("Set..."); mBtnSetGroup->setCommitCallback(boost::bind(&LLPanelLandGeneral::onClickSetGroup, this)); - getChild("group_profile")->setClickedCallback(onClickInfoGroup, this); - mCheckDeedToGroup = getChild( "check deed"); childSetCommitCallback("check deed", onCommitAny, this); @@ -564,14 +557,12 @@ void LLPanelLandGeneral::refresh() mCheckContributeWithDeed->set(FALSE); mCheckContributeWithDeed->setEnabled(FALSE); - mTextOwner->setText(LLStringUtil::null); + mTextOwner->setValue(LLUUID::null); mContentRating->setText(LLStringUtil::null); mLandType->setText(LLStringUtil::null); - mBtnProfile->setLabel(getString("profile_text")); - mBtnProfile->setEnabled(FALSE); mTextClaimDate->setText(LLStringUtil::null); - mTextGroup->setText(LLStringUtil::null); + mTextGroup->setValue(LLUUID::null); mTextPrice->setText(LLStringUtil::null); mSaleInfoForSale1->setVisible(FALSE); @@ -626,16 +617,19 @@ void LLPanelLandGeneral::refresh() BOOL can_be_sold = owner_sellable || estate_manager_sellable; const LLUUID &owner_id = parcel->getOwnerID(); + const LLUUID& group_id = parcel->getGroupID(); BOOL is_public = parcel->isPublic(); + bool group_owned = parcel->getIsGroupOwned(); // Is it owned? + mTextOwner->setValue(is_public ? LLUUID::null : LLSD().with("id", owner_id).with("group", group_owned)); + mTextGroup->setValue(is_public ? LLUUID::null : group_id); if (is_public) { mTextSalePending->setText(LLStringUtil::null); mTextSalePending->setEnabled(FALSE); mTextOwner->setText(getString("public_text")); mTextOwner->setEnabled(FALSE); - mBtnProfile->setEnabled(FALSE); mTextClaimDate->setText(LLStringUtil::null); mTextClaimDate->setEnabled(FALSE); mTextGroup->setText(getString("none_text")); @@ -665,21 +659,13 @@ void LLPanelLandGeneral::refresh() mTextOwner->setEnabled(TRUE); // We support both group and personal profiles - mBtnProfile->setEnabled(TRUE); - - if (parcel->getGroupID().isNull()) + if (group_id.isNull()) { - // Not group owned, so "Profile" - mBtnProfile->setLabel(getString("profile_text")); - mTextGroup->setText(getString("none_text")); mTextGroup->setEnabled(FALSE); } else { - // Group owned, so "Info" - mBtnProfile->setLabel(getString("info_text")); - //mTextGroup->setText("HIPPOS!");//parcel->getGroupName()); mTextGroup->setEnabled(TRUE); } @@ -702,9 +688,7 @@ void LLPanelLandGeneral::refresh() mEditDesc->setEnabled(can_edit_identity); BOOL can_edit_agent_only = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_NO_POWERS); - mBtnSetGroup->setEnabled(can_edit_agent_only && !parcel->getIsGroupOwned()); - - const LLUUID& group_id = parcel->getGroupID(); + mBtnSetGroup->setEnabled(can_edit_agent_only && !group_owned); // Can only allow deeding if you own it and it's got a group. BOOL enable_deed = (owner_id == gAgent.getID() @@ -723,7 +707,7 @@ void LLPanelLandGeneral::refresh() mBtnDeedToGroup->setEnabled( parcel->getAllowDeedToGroup() && group_id.notNull() && can_deed - && !parcel->getIsGroupOwned() + && !group_owned ); mEditName->setText( parcel->getName() ); @@ -838,34 +822,24 @@ void LLPanelLandGeneral::refreshNames() LLParcel *parcel = mParcel->getParcel(); if (!parcel) { - mTextOwner->setText(LLStringUtil::null); - mTextGroup->setText(LLStringUtil::null); + mTextOwner->setValue(LLUUID::null); + mTextGroup->setValue(LLUUID::null); return; } - std::string owner; - if (parcel->getIsGroupOwned()) + bool group_owned = parcel->getIsGroupOwned(); + mTextOwner->setValue(LLSD().with("id", parcel->getOwnerID()).with("group", group_owned)); + if (group_owned) { - owner = getString("group_owned_text"); - } - else - { - // Figure out the owner's name - gCacheName->getFullName(parcel->getOwnerID(), owner); + mTextOwner->setText(getString("group_owned_text")); } if(LLParcel::OS_LEASE_PENDING == parcel->getOwnershipStatus()) { - owner += getString("sale_pending_text"); + mTextOwner->setText(mTextOwner->getText() + getString("sale_pending_text")); } - mTextOwner->setText(owner); - std::string group; - if (!parcel->getGroupID().isNull()) - { - gCacheName->getGroupName(parcel->getGroupID(), group); - } - mTextGroup->setText(group); + mTextGroup->setValue(parcel->getGroupID()); if (parcel->getForSale()) { @@ -907,32 +881,6 @@ void LLPanelLandGeneral::onClickSetGroup() } } -// static -void LLPanelLandGeneral::onClickInfoGroup(void* userdata) -{ - LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)userdata; - LLParcel* parcel = panelp->mParcel->getParcel(); - if (!parcel) return; - LLGroupActions::show(parcel->getGroupID()); -} - -void LLPanelLandGeneral::onClickProfile() -{ - LLParcel* parcel = mParcel->getParcel(); - if (!parcel) return; - - if (parcel->getIsGroupOwned()) - { - const LLUUID& group_id = parcel->getGroupID(); - LLGroupActions::show(group_id); - } - else - { - const LLUUID& avatar_id = parcel->getOwnerID(); - LLAvatarActions::showProfile(avatar_id); - } -} - // public void LLPanelLandGeneral::setGroup(const LLUUID& group_id) { @@ -942,7 +890,6 @@ void LLPanelLandGeneral::setGroup(const LLUUID& group_id) // Set parcel properties and send message parcel->setGroupID(group_id); //parcel->setGroupName(group_name); - //mTextGroup->setText(group_name); // Send update LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate(parcel); @@ -3145,13 +3092,12 @@ void LLPanelLandCovenant::updateLastModified(const std::string& text) } // static -void LLPanelLandCovenant::updateEstateOwnerName(const std::string& name) +void LLPanelLandCovenant::updateEstateOwnerID(const LLUUID& id) { LLPanelLandCovenant* self = LLFloaterLand::getCurrentPanelLandCovenant(); if (self) { - LLTextBox* editor = self->getChild("estate_owner_text"); - if (editor) editor->setText(name); + self->getChildView("estate_owner_text")->setValue(id); } } diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h index eb0cefd7f..1a99e6394 100644 --- a/indra/newview/llfloaterland.h +++ b/indra/newview/llfloaterland.h @@ -148,9 +148,7 @@ public: virtual void draw(); void setGroup(const LLUUID& group_id); - void onClickProfile(); void onClickSetGroup(); - static void onClickInfoGroup(void*); static void onClickDeed(void*); static void onClickBuyLand(void* data); static void onClickScriptLimits(void* data); @@ -191,8 +189,7 @@ protected: LLButton* mBtnSetGroup; LLTextBox* mTextOwner; - LLButton* mBtnProfile; - + LLTextBox* mContentRating; LLTextBox* mLandType; @@ -406,7 +403,7 @@ public: static void updateCovenantText(const std::string& string); static void updateEstateName(const std::string& name); static void updateLastModified(const std::string& text); - static void updateEstateOwnerName(const std::string& name); + static void updateEstateOwnerID(const LLUUID& id); protected: LLSafeHandle& mParcel; diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp index 2f80d004d..9a32f4011 100644 --- a/indra/newview/llfloaterproperties.cpp +++ b/indra/newview/llfloaterproperties.cpp @@ -168,12 +168,6 @@ BOOL LLFloaterProperties::postBuild() getChild("LabelItemName")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitName,this)); getChild("LabelItemDesc")->setPrevalidate(&LLLineEditor::prevalidatePrintableNotPipe); getChild("LabelItemDesc")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitDescription,this)); - // Creator information - getChild("BtnCreator")->setCommitCallback(boost::bind(&LLFloaterProperties::onClickCreator,this)); - // owner information - getChild("BtnOwner")->setCommitCallback(boost::bind(&LLFloaterProperties::onClickOwner,this)); - // last owner information - getChild("BtnLastOwner")->setCommitCallback(boost::bind(&LLFloaterProperties::onClickLastOwner,this)); // acquired date // owner permissions // Permissions debug text @@ -226,11 +220,8 @@ void LLFloaterProperties::refresh() "LabelItemName", "LabelItemDesc", "LabelCreatorName", - "BtnCreator", "LabelOwnerName", - "BtnOwner", "LabelLastOwnerName", - "BtnLastOwner", "CheckOwnerModify", "CheckOwnerCopy", "CheckOwnerTransfer", @@ -328,72 +319,46 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item) if(!gCacheName) return; if(!gAgent.getRegion()) return; + getChild("LabelCreatorName")->setValue(item->getCreatorUUID()); if (item->getCreatorUUID().notNull()) { - std::string name; - gCacheName->getFullName(item->getCreatorUUID(), name); - getChildView("BtnCreator")->setEnabled(TRUE); getChildView("LabelCreatorTitle")->setEnabled(TRUE); getChildView("LabelCreatorName")->setEnabled(TRUE); - getChild("LabelCreatorName")->setValue(name); } else { - getChildView("BtnCreator")->setEnabled(FALSE); getChildView("LabelCreatorTitle")->setEnabled(FALSE); getChildView("LabelCreatorName")->setEnabled(FALSE); - getChild("LabelCreatorName")->setValue(getString("unknown")); + getChild("LabelCreatorName")->setText(getString("unknown")); } + getChild("LabelLastOwnerName")->setValue(perm.getLastOwner()); if (perm.getLastOwner().notNull()) { - std::string name; - gCacheName->getFullName(perm.getLastOwner(), name); getChildView("LabelLastOwnerTitle")->setEnabled(true); getChildView("LabelLastOwnerName")->setEnabled(true); - getChild("LabelLastOwnerName")->setValue(name); } else { getChildView("LabelLastOwnerTitle")->setEnabled(false); getChildView("LabelLastOwnerName")->setEnabled(false); - getChild("LabelLastOwnerName")->setValue(getString("unknown")); + getChild("LabelLastOwnerName")->setText(getString("unknown")); } //////////////// // OWNER NAME // //////////////// + getChild("LabelOwnerName")->setValue(perm.getOwner()); if(perm.isOwned()) { - std::string name; - if (perm.isGroupOwned()) - { - gCacheName->getGroupName(perm.getGroup(), name); - } - else - { - gCacheName->getFullName(perm.getOwner(), name); -// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) - if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) - { - name = RlvStrings::getAnonym(name); - } -// [/RLVa:KB] - } - getChildView("BtnOwner")->setEnabled(TRUE); -// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-1.0.0e - getChildView("BtnOwner")->setEnabled(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)); -// [/RLVa:KB] getChildView("LabelOwnerTitle")->setEnabled(TRUE); getChildView("LabelOwnerName")->setEnabled(TRUE); - getChild("LabelOwnerName")->setValue(name); } else { - getChildView("BtnOwner")->setEnabled(FALSE); getChildView("LabelOwnerTitle")->setEnabled(FALSE); getChildView("LabelOwnerName")->setEnabled(FALSE); - getChild("LabelOwnerName")->setValue(getString("public")); + getChild("LabelOwnerName")->setText(getString("public")); } ////////////////// @@ -609,38 +574,6 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item) } } -void LLFloaterProperties::onClickCreator() -{ - LLInventoryItem* item = findItem(); - if(!item) return; - LLAvatarActions::showProfile(item->getCreatorUUID()); -} - -// static -void LLFloaterProperties::onClickOwner() -{ - LLInventoryItem* item = findItem(); - if(!item) return; - if(item->getPermissions().isGroupOwned()) - { - LLGroupActions::show(item->getPermissions().getGroup()); - } - else - { -// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) - if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) -// [/RLVa:KB] - { - LLAvatarActions::showProfile(item->getPermissions().getOwner()); - } - } -} - -void LLFloaterProperties::onClickLastOwner() -{ - if (const LLInventoryItem* item = findItem()) LLAvatarActions::showProfile(item->getPermissions().getLastOwner()); -} - // static void LLFloaterProperties::onCommitName() { diff --git a/indra/newview/llfloaterproperties.h b/indra/newview/llfloaterproperties.h index d2640f07d..5d90fea0c 100644 --- a/indra/newview/llfloaterproperties.h +++ b/indra/newview/llfloaterproperties.h @@ -74,9 +74,6 @@ public: protected: // ui callbacks - void onClickCreator(); - void onClickOwner(); - void onClickLastOwner(); void onCommitName(); void onCommitDescription(); void onCommitPermissions(); diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index fc4818e32..9f08b1295 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -1676,12 +1676,12 @@ struct LLEstateAccessChangeInfo }; // static -void LLPanelEstateInfo::updateEstateOwnerName(const std::string& name) +void LLPanelEstateInfo::updateEstateOwnerID(const LLUUID& id) { LLPanelEstateInfo* panelp = LLFloaterRegionInfo::getPanelEstate(); if (panelp) { - panelp->setOwnerName(name); + panelp->getChild("estate_owner")->setValue(id); } } @@ -1800,7 +1800,7 @@ void LLPanelEstateInfo::refreshFromEstate() const LLEstateInfoModel& estate_info = LLEstateInfoModel::instance(); getChild("estate_name")->setValue(estate_info.getName()); - LLAvatarNameCache::get(estate_info.getOwnerID(), boost::bind(&LLPanelEstateInfo::setOwnerName, this, boost::bind(&LLAvatarName::getNSName, _2, main_name_system()))); + getChild("estate_owner")->setValue(estate_info.getOwnerID()); getChild("externally_visible_check")->setValue(estate_info.getIsExternallyVisible()); getChild("voice_chat_check")->setValue(estate_info.getAllowVoiceChat()); @@ -1924,12 +1924,7 @@ void LLPanelEstateInfo::getEstateOwner() const std::string LLPanelEstateInfo::getOwnerName() const { - return getChild("estate_owner")->getValue().asString(); -} - -void LLPanelEstateInfo::setOwnerName(const std::string& name) -{ - getChild("estate_owner")->setValue(LLSD(name)); + return getChild("estate_owner")->getText(); } // static @@ -2294,12 +2289,12 @@ void LLPanelEstateCovenant::updateLastModified(const std::string& text) } // static -void LLPanelEstateCovenant::updateEstateOwnerName(const std::string& name) +void LLPanelEstateCovenant::updateEstateOwnerID(const LLUUID& id) { LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant(); if( panelp ) { - panelp->mEstateOwnerText->setText(name); + panelp->mEstateOwnerText->setValue(id); } } @@ -2308,11 +2303,6 @@ std::string LLPanelEstateCovenant::getOwnerName() const return mEstateOwnerText->getText(); } -void LLPanelEstateCovenant::setOwnerName(const std::string& name) -{ - mEstateOwnerText->setText(name); -} - void LLPanelEstateCovenant::setCovenantTextEditor(const std::string& text) { mEditor->setText(text, false); diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 58141e930..96daf580a 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -292,7 +292,7 @@ public: void updateControls(LLViewerRegion* region); static void updateEstateName(const std::string& name); - static void updateEstateOwnerName(const std::string& name); + static void updateEstateOwnerID(const LLUUID& id); virtual bool refreshFromRegion(LLViewerRegion* region); virtual bool estateUpdate(LLMessageSystem* msg); @@ -307,7 +307,6 @@ public: static bool isLindenEstate(); const std::string getOwnerName() const; - void setOwnerName(const std::string& name); protected: virtual BOOL sendUpdate(); @@ -355,14 +354,13 @@ public: static void updateCovenantText(const std::string& string, const LLUUID& asset_id); static void updateEstateName(const std::string& name); static void updateLastModified(const std::string& text); - static void updateEstateOwnerName(const std::string& name); + static void updateEstateOwnerID(const LLUUID& id); const LLUUID& getCovenantID() const { return mCovenantID; } void setCovenantID(const LLUUID& id) { mCovenantID = id; } std::string getEstateName() const; void setEstateName(const std::string& name); std::string getOwnerName() const; - void setOwnerName(const std::string& name); void setCovenantTextEditor(const std::string& text); typedef enum e_asset_status diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp index cb59b6e32..54e362726 100644 --- a/indra/newview/llnamebox.cpp +++ b/indra/newview/llnamebox.cpp @@ -80,6 +80,7 @@ void LLNameBox::initFromXML(LLXMLNodePtr node, LLView* parent) node->getAttributeString("initial_value", mInitialValue); setText(mInitialValue); node->getAttribute_bool("rlv_sensitive", mRLVSensitive); + node->getAttribute_bool("is_group", mIsGroup); } // static diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h index a7b10e167..220db59f6 100644 --- a/indra/newview/llnamebox.h +++ b/indra/newview/llnamebox.h @@ -45,6 +45,8 @@ public: static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); void setText(const std::string& text) override final { LLTextBox::setText(text); } + void setValue(const LLSD& value) override final { LLNameUI::setValue(value); } + LLSD getValue() const override final { return LLNameUI::getValue(); } void showProfile(); BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override final; diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp index a82a34dd8..86c9f89a6 100644 --- a/indra/newview/llnameeditor.cpp +++ b/indra/newview/llnameeditor.cpp @@ -83,16 +83,6 @@ void LLNameEditor::setText(const std::string& text) LLLineEditor::setText(text); } -void LLNameEditor::setValue( const LLSD& value ) -{ - setNameID(value.asUUID(), FALSE); -} - -LLSD LLNameEditor::getValue() const -{ - return LLSD(mNameID); -} - // virtual LLXMLNodePtr LLNameEditor::getXML(bool save_children) const { diff --git a/indra/newview/llnameeditor.h b/indra/newview/llnameeditor.h index e7812927d..0a64d2b77 100644 --- a/indra/newview/llnameeditor.h +++ b/indra/newview/llnameeditor.h @@ -54,9 +54,8 @@ public: LLXMLNodePtr getXML(bool save_children = true) const override final; static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); - // Take/return agent UUIDs - void setValue(const LLSD& value) override final; - LLSD getValue() const override final; + void setValue(const LLSD& value) override final { LLNameUI::setValue(value); } + LLSD getValue() const override final { return LLNameUI::getValue(); } void setText(const std::string& text) override final; }; diff --git a/indra/newview/llnameui.h b/indra/newview/llnameui.h index 599a31b8f..bda80a368 100644 --- a/indra/newview/llnameui.h +++ b/indra/newview/llnameui.h @@ -52,6 +52,17 @@ struct LLNameUI : public LFIDBearer virtual void setText(const std::string& text) = 0; + // Take either UUID or a map of "id" to UUID and "group" to boolean + virtual void setValue(const LLSD& value) + { + if (value.has("id")) + setNameID(value["id"].asUUID(), value["group"].asBoolean()); + else + setNameID(value.asUUID(), mIsGroup); + } + // Return agent UUIDs + virtual LLSD getValue() const { return LLSD(mNameID); } + private: static std::set sInstances; diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index a5d0b2f87..6692cdb64 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -141,7 +141,6 @@ LLPanelAvatarSecondLife::LLPanelAvatarSecondLife(const std::string& name, LLPanelAvatarSecondLife::~LLPanelAvatarSecondLife() { - mCacheConnection.disconnect(); LLMuteList::instance().removeObserver(this); } @@ -149,12 +148,6 @@ void LLPanelAvatarSecondLife::refresh() { } -void LLPanelAvatarSecondLife::updatePartnerName(const LLAvatarName& name) -{ - mCacheConnection.disconnect(); - childSetTextArg("partner_edit", "[NAME]", name.getNSName()); -} - //----------------------------------------------------------------------------- // clearControls() // Empty the data out of the controls, since we have to wait for new @@ -219,8 +212,7 @@ void LLPanelAvatarSecondLife::processProperties(void* data, EAvatarProcessorType mPartnerID = pAvatarData->partner_id; if (mPartnerID.notNull()) { - mCacheConnection.disconnect(); - mCacheConnection = LLAvatarNameCache::get(mPartnerID, boost::bind(&LLPanelAvatarSecondLife::updatePartnerName, this, _2)); + getChildView("partner_edit")->setValue(mPartnerID); childSetEnabled("partner_info", TRUE); } } @@ -401,7 +393,7 @@ BOOL LLPanelAvatarSecondLife::postBuild() ctrl->setFallbackImageName("default_profile_picture.j2c"); auto show_pic = [&] { - show_picture(getChild("img")->getImageAssetID(), profile_picture_title(getChildView("dnname")->getValue())); + show_picture(getChild("img")->getImageAssetID(), profile_picture_title(getChild("dnname")->getText())); }; auto show_pic_if_not_self = [=] { if (!ctrl->canChange()) show_pic(); }; @@ -1251,25 +1243,19 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status) } } -void LLPanelAvatar::onAvatarNameResponse(const LLUUID& agent_id, const LLAvatarName& av_name) -{ - mCacheConnection.disconnect(); - getChild("dnname")->setText(gSavedSettings.getBOOL("SinguCompleteNameProfiles") ? av_name.getCompleteName() : av_name.getNSName()); -} - void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id) { - if (avatar_id.isNull()) return; - - //BOOL avatar_changed = FALSE; + auto dnname = getChild("dnname"); if (avatar_id != mAvatarID) { - //avatar_changed = TRUE; if (mAvatarID.notNull()) LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarID, this); mAvatarID = avatar_id; + dnname->setNameID(avatar_id, false); } + if (avatar_id.isNull()) return; + LLAvatarPropertiesProcessor::getInstance()->addObserver(mAvatarID, this); // Determine if we have their calling card. @@ -1294,8 +1280,6 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id) if (LLDropTarget* drop_target = findChild("drop_target_rect")) drop_target->setEntityID(mAvatarID); - mCacheConnection.disconnect(); - mCacheConnection = LLAvatarNameCache::get(avatar_id, boost::bind(&LLPanelAvatar::onAvatarNameResponse, this, _1, _2)); if (auto key_edit = getChildView("avatar_key")) key_edit->setValue(mAvatarID.asString()); diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h index 022b37641..a1faffb9e 100644 --- a/indra/newview/llpanelavatar.h +++ b/indra/newview/llpanelavatar.h @@ -119,11 +119,9 @@ public: void clearControls(); void enableControls(BOOL own_avatar); void updateOnlineText(BOOL online, BOOL have_calling_card); - void updatePartnerName(const LLAvatarName& name); private: LLUUID mPartnerID; - boost::signals2::connection mCacheConnection; }; @@ -280,8 +278,6 @@ public: void setAvatar(LLViewerObject *avatarp); - void onAvatarNameResponse(const LLUUID& agent_id, const LLAvatarName& av_name); - // Fill in the avatar ID and handle some field fill-in, as well as // button enablement. void setAvatarID(const LLUUID &avatar_id); diff --git a/indra/newview/llpanelevent.cpp b/indra/newview/llpanelevent.cpp index 66644c803..5eb6fe51d 100644 --- a/indra/newview/llpanelevent.cpp +++ b/indra/newview/llpanelevent.cpp @@ -139,9 +139,8 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **) msg->getU32("EventData", "EventID", event_id); // look up all panels which have this avatar - for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter) + for (auto& self : sAllPanels) { - LLPanelEvent* self = *iter; // Skip updating panels which aren't for this event if (self->mEventID != event_id) { @@ -152,6 +151,7 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **) self->mTBCategory->setText(self->mEventInfo.mCategoryStr); self->mTBDate->setText(self->mEventInfo.mTimeStr); self->mTBDesc->setText(self->mEventInfo.mDesc, false); + self->mTBRunBy->setValue(self->mEventInfo.mRunByID); self->mTBDuration->setText(llformat("%d:%.2d", self->mEventInfo.mDuration / 60, self->mEventInfo.mDuration % 60)); @@ -205,17 +205,6 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **) } } - -void LLPanelEvent::draw() -{ - std::string name; - gCacheName->getFullName(mEventInfo.mRunByID, name); - - mTBRunBy->setText(name); - - LLPanel::draw(); -} - void LLPanelEvent::resetInfo() { // Clear all of the text fields. diff --git a/indra/newview/llpanelevent.h b/indra/newview/llpanelevent.h index 90c08bde0..353b66fd1 100644 --- a/indra/newview/llpanelevent.h +++ b/indra/newview/llpanelevent.h @@ -51,7 +51,6 @@ public: /*virtual*/ ~LLPanelEvent(); /*virtual*/ BOOL postBuild(); - /*virtual*/ void draw(); void setEventID(const U32 event_id); void sendEventInfoRequest(); diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index eeccea15e..86b6054e4 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -83,7 +83,6 @@ LLPanelGroupGeneral::LLPanelGroupGeneral(const std::string& name, mGroupNameEditor(NULL), mFounderName(NULL), mInsignia(NULL), - mGroupName(NULL), mEditCharter(NULL), mBtnJoinGroup(NULL), mListVisibleMembers(NULL), @@ -121,8 +120,7 @@ BOOL LLPanelGroupGeneral::postBuild() // General info mGroupNameEditor = getChild("group_name_editor", recurse); - mGroupName = getChild("group_name", recurse); - + mInsignia = getChild("insignia", recurse); if (mInsignia) { @@ -263,7 +261,7 @@ BOOL LLPanelGroupGeneral::postBuild() mBtnJoinGroup->setVisible(FALSE); mBtnInfo->setVisible(FALSE); - mGroupName->setVisible(FALSE); + getChildView("group_name")->setVisible(FALSE); } std::string member_count(LLTrans::getString("LoadingData")); @@ -731,10 +729,10 @@ void LLPanelGroupGeneral::update(LLGroupChange gc) if (mInsignia) mInsignia->setEnabled(can_change_ident); if (mEditCharter) mEditCharter->setEnabled(can_change_ident); - - if (mGroupName) mGroupName->setText(gdatap->mName); + + getChildView("group_name")->setValue(mGroupID); if (mGroupNameEditor) mGroupNameEditor->setVisible(FALSE); - if (mFounderName) mFounderName->setNameID(gdatap->mFounderID,FALSE); + if (mFounderName) mFounderName->setValue(gdatap->mFounderID); if (auto key_edit = getChildView("group_key")) { @@ -907,7 +905,6 @@ void LLPanelGroupGeneral::updateChanged() LLUICtrl *check_list[] = { mGroupNameEditor, - mGroupName, mFounderName, mInsignia, mEditCharter, diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h index a0a1fd5fb..aa54e83b7 100644 --- a/indra/newview/llpanelgroupgeneral.h +++ b/indra/newview/llpanelgroupgeneral.h @@ -91,7 +91,6 @@ private: // Group information (include any updates in updateChanged) LLLineEditor *mGroupNameEditor; - LLTextBox *mGroupName; LLNameBox *mFounderName; LLTextureCtrl *mInsignia; LLTextEditor *mEditCharter; diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index d881f1b16..cea17bbc5 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -69,10 +69,6 @@ -// [RLVa:KB] -#include "rlvhandler.h" -// [/RLVa:KB] - // base and own must have EXPORT, next owner must be UNRESTRICTED bool can_set_export(const U32& base, const U32& own, const U32& next) { @@ -117,13 +113,7 @@ BOOL LLPanelPermissions::postBuild() childSetCommitCallback("Object Description",LLPanelPermissions::onCommitDesc,this); getChild("Object Description")->setPrevalidate(&LLLineEditor::prevalidatePrintableNotPipe); - - getChild("button owner profile")->setCommitCallback(boost::bind(&LLPanelPermissions::onClickOwner,this)); - getChild("button last owner profile")->setCommitCallback(boost::bind(&LLPanelPermissions::onClickLastOwner,this)); - getChild("button creator profile")->setCommitCallback(boost::bind(&LLPanelPermissions::onClickCreator,this)); - getChild("button set group")->setCommitCallback(boost::bind(&LLPanelPermissions::onClickGroup,this)); - getChild("button open group")->setCommitCallback(boost::bind(LLPanelPermissions::onClickOpenGroup)); childSetCommitCallback("checkbox share with group",LLPanelPermissions::onCommitGroupShare,this); @@ -182,25 +172,33 @@ void LLPanelPermissions::disableAll() getChild("pathfinding_attributes_value")->setValue(LLStringUtil::null); getChildView("Creator:")->setEnabled(FALSE); - getChild("Creator Name")->setValue(LLStringUtil::null); - getChildView("Creator Name")->setEnabled(FALSE); - getChildView("button creator profile")->setEnabled(FALSE); + if (auto view = getChildView("Creator Name")) + { + view->setValue(LLUUID::null); + view->setEnabled(FALSE); + } getChildView("Owner:")->setEnabled(FALSE); - getChild("Owner Name")->setValue(LLStringUtil::null); - getChildView("Owner Name")->setEnabled(FALSE); - getChildView("button owner profile")->setEnabled(FALSE); + if (auto view = getChildView("Owner Name")) + { + view->setValue(LLUUID::null); + view->setEnabled(FALSE); + } getChildView("Last Owner:")->setEnabled(FALSE); - getChild("Last Owner Name")->setValue(LLStringUtil::null); - getChildView("Last Owner Name")->setEnabled(FALSE); - getChildView("button last owner profile")->setEnabled(FALSE); - + if (auto view = getChildView("Last Owner Name")) + { + view->setValue(LLUUID::null); + view->setEnabled(FALSE); + } + getChildView("Group:")->setEnabled(FALSE); - getChild("Group Name Proxy")->setValue(LLStringUtil::null); - getChildView("Group Name Proxy")->setEnabled(FALSE); + if (auto view = getChildView("Group Name Proxy")) + { + view->setValue(LLUUID::null); + view->setEnabled(FALSE); + } getChildView("button set group")->setEnabled(FALSE); - getChildView("button open group")->setEnabled(FALSE); LLLineEditor* ed = getChild("Object Name"); ed->setValue(LLStringUtil::null); @@ -385,18 +383,6 @@ void LLPanelPermissions::refresh() // Update creator text field getChildView("Creator:")->setEnabled(TRUE); -// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Modified: RLVa-1.2.2a - BOOL creators_identical = FALSE; -// [/RLVa:KB] - std::string creator_name; -// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Modified: RLVa-1.2.2a - creators_identical = LLSelectMgr::getInstance()->selectGetCreator(mCreatorID, creator_name); -// [/RLVa:KB] -// LLSelectMgr::getInstance()->selectGetCreator(mCreatorID, creator_name); - -// getChild("Creator Name")->setValue(creator_name); -// getChildView("Creator Name")->setEnabled(TRUE); -// [RLVa:KB] - Moved further down to avoid an annoying flicker when the text is set twice in a row // Update owner text field getChildView("Owner:")->setEnabled(TRUE); @@ -404,101 +390,29 @@ void LLPanelPermissions::refresh() // Update last owner text field getChildView("Last Owner:")->setEnabled(TRUE); - std::string owner_name; - const BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(mOwnerID, owner_name); + std::string owner_app_link; + const BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(mOwnerID, owner_app_link); -// LL_INFOS() << "owners_identical " << (owners_identical ? "TRUE": "FALSE") << LL_ENDL; - std::string last_owner_name; - LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, last_owner_name); - - if (mOwnerID.isNull()) + if (auto view = getChildView("Creator Name")) { - if(LLSelectMgr::getInstance()->selectIsGroupOwned()) - { - // Group owned already displayed by selectGetOwner - } - else - { - // Display last owner if public - std::string last_owner_name; - LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, last_owner_name); - - // It should never happen that the last owner is null and the owner - // is null, but it seems to be a bug in the simulator right now. JC - if (!mLastOwnerID.isNull() && !last_owner_name.empty()) - { - owner_name.append(", last "); - owner_name.append( last_owner_name ); - } - } + view->setValue(mCreatorID); + view->setEnabled(true); } -// getChild("Owner Name")->setValue(owner_name); -// getChildView("Owner Name")->setEnabled(TRUE); -// [RLVa:KB] - Moved further down to avoid an annoying flicker when the text is set twice in a row -// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Modified: RLVa-1.2.2a - bool fRlvEnableOwner = true; - bool fRlvEnableCreator = true; - bool fRlvEnableLastOwner = true; - if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) + if (auto view = getChild("Owner Name")) { - // Only anonymize the creator if all of the selection was created by the same avie who's also the owner or they're a nearby avie - if ( (creators_identical) && (mCreatorID != gAgent.getID()) && ((mCreatorID == mOwnerID) || (RlvUtil::isNearbyAgent(mCreatorID))) ) - { - creator_name = RlvStrings::getAnonym(creator_name); - fRlvEnableCreator = false; - } - - // Only anonymize the owner name if all of the selection is owned by the same avie and isn't group owned - if ( (owners_identical) && (!LLSelectMgr::getInstance()->selectIsGroupOwned()) && (mOwnerID != gAgent.getID()) ) - { - owner_name = RlvStrings::getAnonym(owner_name); - fRlvEnableOwner = false; - } - - if (RlvUtil::isNearbyAgent(mLastOwnerID)) - { - last_owner_name = RlvStrings::getAnonym(last_owner_name); - fRlvEnableLastOwner = false; - } + view->setValue(mOwnerID); + view->setEnabled(true); } - else if ((objectp->isAttachment() || objectp->isAvatar()) && gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMETAGS) && mOwnerID != gAgentID) + + if (auto view = getChild("Last Owner Name")) { - owner_name = RlvStrings::getAnonym(owner_name); - fRlvEnableOwner = false; - - if (mOwnerID == mCreatorID) - { - creator_name = RlvStrings::getAnonym(creator_name); - fRlvEnableCreator = false; - } - - if (mOwnerID == mLastOwnerID) - { - last_owner_name = RlvStrings::getAnonym(last_owner_name); - fRlvEnableLastOwner = false; - } + view->setValue(mLastOwnerID); + view->setEnabled(true); } -// [/RLVa:KB] - getChild("Creator Name")->setValue(creator_name); - getChildView("Creator Name")->setEnabled(TRUE); - - getChild("Owner Name")->setValue(owner_name); - getChildView("Owner Name")->setEnabled(TRUE); -// childSetEnabled("button owner profile",owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned())); -// getChildView("button last owner profile")->setEnabled(owners_identical && mLastOwnerID.notNull()); -// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) - getChildView("button owner profile")->setEnabled(fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned())); - getChildView("button creator profile")->setEnabled(fRlvEnableCreator && creators_identical && mCreatorID.notNull()); - getChildView("button last owner profile")->setEnabled(fRlvEnableLastOwner && owners_identical && mLastOwnerID.notNull()); -// [/RLVa:KB] - - getChild("Last Owner Name")->setValue(last_owner_name); - getChildView("Last Owner Name")->setEnabled(TRUE); // update group text field getChildView("Group:")->setEnabled(TRUE); - //getChild("Group Name")->setValue(LLStringUtil::null); LLUUID group_id; BOOL groups_identical = LLSelectMgr::getInstance()->selectGetGroup(group_id); if (groups_identical) @@ -520,7 +434,6 @@ void LLPanelPermissions::refresh() } getChildView("button set group")->setEnabled(root_selected && owners_identical && (mOwnerID == gAgent.getID()) && is_nonpermanent_enforced); - getChildView("button open group")->setEnabled(group_id.notNull()); getChildView("Name:")->setEnabled(TRUE); LLLineEditor* LineEditorObjectName = getChild("Object Name"); @@ -1049,36 +962,6 @@ void LLPanelPermissions::onClickRelease(void*) LLSelectMgr::getInstance()->sendOwner(LLUUID::null, LLUUID::null); } -void LLPanelPermissions::onClickCreator() -{ - LLAvatarActions::showProfile(mCreatorID); -} - -void LLPanelPermissions::onClickOwner() -{ - if (LLSelectMgr::getInstance()->selectIsGroupOwned()) - { - LLUUID group_id; - LLSelectMgr::getInstance()->selectGetGroup(group_id); - LLGroupActions::show(group_id); - } - else - { -// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) - if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) - { - LLAvatarActions::showProfile(mOwnerID); - } -// [/RLVa:KB] -// LLAvatarActions::showProfile(mOwnerID); - } -} - -void LLPanelPermissions::onClickLastOwner() -{ - LLAvatarActions::showProfile(mLastOwnerID); -} - void LLPanelPermissions::onClickGroup() { LLUUID owner_id; @@ -1103,13 +986,6 @@ void LLPanelPermissions::onClickGroup() } } -void LLPanelPermissions::onClickOpenGroup() -{ - LLUUID group_id; - LLSelectMgr::getInstance()->selectGetGroup(group_id); - LLGroupActions::show(group_id); -} - void LLPanelPermissions::cbGroupID(LLUUID group_id) { if(mLabelGroupName) diff --git a/indra/newview/llpanelpermissions.h b/indra/newview/llpanelpermissions.h index 58b6dbac9..87868108b 100644 --- a/indra/newview/llpanelpermissions.h +++ b/indra/newview/llpanelpermissions.h @@ -58,11 +58,7 @@ protected: // statics static void onClickClaim(void*); static void onClickRelease(void*); - void onClickCreator(); - void onClickOwner(); - void onClickLastOwner(); void onClickGroup(); - static void onClickOpenGroup(); void cbGroupID(LLUUID group_id); static void onClickDeedToGroup(void*); static void onClickCopyObjKey(); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6c0499ffc..6ea9d1960 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -168,7 +168,6 @@ extern bool gShiftFrame; // function prototypes bool check_offer_throttle(const std::string& from_name, bool check_only); bool check_asset_previewable(const LLAssetType::EType asset_type); -void callbackCacheEstateOwnerName(const LLUUID& id, const LLAvatarName& av_name); static void process_money_balance_reply_extended(LLMessageSystem* msg); //inventory offer throttle globals @@ -8595,7 +8594,10 @@ void process_covenant_reply(LLMessageSystem* msg, void**) LLPanelEstateInfo::updateEstateName(estate_name); LLFloaterBuyLand::updateEstateName(estate_name); - LLAvatarNameCache::get(estate_owner_id, boost::bind(&callbackCacheEstateOwnerName, _1, _2)); + LLPanelEstateCovenant::updateEstateOwnerID(estate_owner_id); + LLPanelLandCovenant::updateEstateOwnerID(estate_owner_id); + LLPanelEstateInfo::updateEstateOwnerID(estate_owner_id); + LLFloaterBuyLand::updateEstateOwnerID(estate_owner_id); // standard message, not from system std::string last_modified; @@ -8644,15 +8646,6 @@ void process_covenant_reply(LLMessageSystem* msg, void**) } } -void callbackCacheEstateOwnerName(const LLUUID& id, const LLAvatarName& av_name) -{ - const std::string name(av_name.getNSName()); - LLPanelEstateCovenant::updateEstateOwnerName(name); - LLPanelLandCovenant::updateEstateOwnerName(name); - LLPanelEstateInfo::updateEstateOwnerName(name); - LLFloaterBuyLand::updateEstateOwnerName(name); -} - void onCovenantLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type, diff --git a/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/indra/newview/skins/default/xui/en-us/floater_about_land.xml index 79fdb8851..a08e799bc 100644 --- a/indra/newview/skins/default/xui/en-us/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en-us/floater_about_land.xml @@ -63,32 +63,25 @@ mouse_opaque="true" name="Owner:" v_pad="0" width="92"> Owner: - Leyla Linden - - diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml index b2bec23dd..574795dbd 100644 --- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml @@ -26,7 +26,7 @@ - + @@ -42,5 +42,10 @@ + + + + + diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml index 8f106d271..fb2a758fd 100644 --- a/indra/newview/skins/default/xui/es/floater_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_tools.xml @@ -143,7 +143,7 @@ Grupo: - diff --git a/indra/newview/skins/default/xui/es/panel_avatar.xml b/indra/newview/skins/default/xui/es/panel_avatar.xml index b1cc5e6b3..46a968658 100644 --- a/indra/newview/skins/default/xui/es/panel_avatar.xml +++ b/indra/newview/skins/default/xui/es/panel_avatar.xml @@ -21,17 +21,15 @@ Nacido: - Cuenta: - Compañera/o: