diff --git a/.gitattributes b/.gitattributes index baf02f46e3..3a4c44aedc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -30,7 +30,6 @@ indra/tools/vstool/* -text # Files with Windows line endings VivoxAUP.txt text eol=crlf FILES_ARE_UNICODE_UTF-16LE.txt text eol=crlf -*.nsi text eol=crlf # Windows Manifest files *.manifest text eol=crlf diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index d85167e867..439c0136be 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -30,7 +30,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 - if: runner.os != 'Windows' id: py311 with: python-version: '3.11' diff --git a/autobuild.xml b/autobuild.xml index f7a237b31b..fefa4d1a2e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1140,11 +1140,11 @@ archive hash - 9d9f72f50cffe7443e4b58f009ffc1f4 + 8ee7c21f3f109cf4e1709e4af0b4bebf hash_algorithm md5 url - file:///opt/firestorm/fmodstudio-2.02.15-darwin64-9.tar.bz2 + file:///opt/firestorm/fmodstudio-2.02.17-darwin64-232401806.tar.bz2 name darwin64 @@ -1154,11 +1154,11 @@ archive hash - 79fb2f09d2c81ed6464e11af36566910 + 8c82bd0fd9b544d02c8da1f9d921e964 hash_algorithm md5 url - file:///opt/firestorm/fmodstudio-2.02.15-linux64-231741426.tar.bz2 + file:///opt/firestorm/fmodstudio-2.02.17-linux64-232401431.tar.bz2 name linux64 @@ -1168,11 +1168,11 @@ archive hash - c1bce2b362c31345200297a4010626e9 + fb5a3f97091028859ffa8c2768536b52 hash_algorithm md5 url - file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.15-windows-231741106.tar.bz2 + file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.17-windows-232401332.tar.bz2 name windows @@ -1182,18 +1182,18 @@ archive hash - cd0e8f58fece3eac0b5ebe21f354bf8c + f8e4fdd3eafbd54c01f5f78d04b95bf8 hash_algorithm md5 url - file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.15-windows64-231741113.tar.bz2 + file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.17-windows64-232401329.tar.bz2 name windows64 version - 2.02.15 + 2.02.17 fontconfig @@ -1818,9 +1818,9 @@ archive hash - e99b86fc3ed48a778580dd1449f8f33b + 3142fccbcc0e2c5a019e3177ef364290 url - file:///opt/firestorm/kdu-8.2-darwin-212431232.tar.bz2 + file:///opt/firestorm/kdu-8.3-darwin64-232392239.tar.bz2 name darwin64 @@ -1830,9 +1830,9 @@ archive hash - c4dd59fbb0709fc4c7b5ab69b20246f8 + e13d6fe708613bb3a5d630c4cdd97a3b url - file:///opt/firestorm/kdu-8.2-linux64_bionic-220911445.tar.bz2 + file:///opt/firestorm/kdu-8.3-linux64-232392238.tar.bz2 name linux64 @@ -1842,9 +1842,9 @@ archive hash - e88372fa10b83c6900443dcc12c12338 + 4aa7df19125708580055b42190d2511e url - file:///c:/cygwin/opt/firestorm/kdu-8.2-windows-212351246.tar.bz2 + file:///c:/cygwin/opt/firestorm/kdu-8.3-windows-232392239.tar.bz2 name windows @@ -1854,16 +1854,16 @@ archive hash - e88372fa10b83c6900443dcc12c12338 + 4aa7df19125708580055b42190d2511e url - file:///c:/cygwin/opt/firestorm/kdu-8.2-windows-212351246.tar.bz2 + file:///c:/cygwin/opt/firestorm/kdu-8.3-windows-232392239.tar.bz2 name windows64 version - 8.0.6 + 8.3 libhunspell diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake index 1f954c8f65..573112eded 100644 --- a/indra/cmake/Python.cmake +++ b/indra/cmake/Python.cmake @@ -50,7 +50,7 @@ elseif (WINDOWS) ${pymaybe} ) endif() - include(FindPythonInterp) + find_package(Python3 COMPONENTS Interpreter) else() find_program(python python3) diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h index a3cab97cd2..562c96c794 100644 --- a/indra/llaudio/llaudioengine_openal.h +++ b/indra/llaudio/llaudioengine_openal.h @@ -42,6 +42,7 @@ class LLAudioEngine_OpenAL : public LLAudioEngine virtual bool init(void *user_data, const std::string &app_title); virtual std::string getDriverName(bool verbose); + virtual LLStreamingAudioInterface* createDefaultStreamingAudioImpl() const { return nullptr; } virtual void allocateListener(); virtual void shutdown(); @@ -56,7 +57,6 @@ class LLAudioEngine_OpenAL : public LLAudioEngine /*virtual*/ void updateWind(LLVector3 direction, F32 camera_altitude); private: - void * windDSP(void *newbuffer, int length); typedef S16 WIND_SAMPLE_T; LLWindGen *mWindGen; S16 *mWindBuf; diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt index 2bc09accb2..168915ac73 100644 --- a/indra/llrender/CMakeLists.txt +++ b/indra/llrender/CMakeLists.txt @@ -90,6 +90,8 @@ endif (BUILD_HEADLESS) add_library (llrender ${llrender_SOURCE_FILES}) target_include_directories( llrender INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +set_property(TARGET llrender PROPERTY POSITION_INDEPENDENT_CODE ON) + # Libraries on which this library depends, needed for Linux builds # Sort by high-level to low-level target_link_libraries(llrender diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 6c902f1eb2..186b544ba8 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -654,6 +654,6 @@ execute_parameters="performance" is_running_function="Floater.IsOpen" is_running_parameters="performance" - checkbox_control="FSAutoTuneFPS" + checkbox_control="AutoTuneFPS" /> diff --git a/indra/newview/fspanelcontactsets.cpp b/indra/newview/fspanelcontactsets.cpp index eeb2403955..9e9f021ab5 100644 --- a/indra/newview/fspanelcontactsets.cpp +++ b/indra/newview/fspanelcontactsets.cpp @@ -42,12 +42,10 @@ #include "llpanelpeoplemenus.h" #include "llslurl.h" -const U32 MAX_SELECTIONS = 20; +constexpr U32 MAX_SELECTIONS = 20; static LLPanelInjector t_panel_contact_sets("contact_sets_panel"); FSPanelContactSets::FSPanelContactSets() : LLPanel() -, mContactSetCombo(NULL) -, mAvatarList(NULL) { mContactSetChangedConnection = LGGContactSets::getInstance()->setContactSetChangeCallback(boost::bind(&FSPanelContactSets::updateSets, this, _1)); } @@ -130,7 +128,7 @@ void FSPanelContactSets::generateAvatarList(const std::string& contact_set) ++buddy) { // Only show our buddies who aren't in a set, by request. - if (!LGGContactSets::getInstance()->isFriendInSet(buddy->first)) + if (!LGGContactSets::getInstance()->isFriendInAnySet(buddy->first)) avatars.push_back(buddy->first); } } @@ -144,10 +142,12 @@ void FSPanelContactSets::generateAvatarList(const std::string& contact_set) } else if (!LGGContactSets::getInstance()->isInternalSetName(contact_set)) { - LGGContactSets::ContactSet* group = LGGContactSets::getInstance()->getContactSet(contact_set); // UGLY! - for (auto const& id : group->mFriends) + if (LGGContactSets::ContactSet* group = LGGContactSets::getInstance()->getContactSet(contact_set); group)// UGLY! { - avatars.push_back(id); + for (auto const& id : group->mFriends) + { + avatars.push_back(id); + } } } getChild("member_count")->setTextArg("[COUNT]", llformat("%d", avatars.size())); @@ -198,7 +198,7 @@ void FSPanelContactSets::refreshContactSets() std::vector contact_sets = LGGContactSets::getInstance()->getAllContactSets(); if (!contact_sets.empty()) { - for(auto const& set_name : contact_sets) + for (auto const& set_name : contact_sets) { mContactSetCombo->add(set_name); } diff --git a/indra/newview/fspanelcontactsets.h b/indra/newview/fspanelcontactsets.h index 98f5deb4de..bde45e43d5 100644 --- a/indra/newview/fspanelcontactsets.h +++ b/indra/newview/fspanelcontactsets.h @@ -70,8 +70,8 @@ private: uuid_vec_t mAvatarSelections; - LLComboBox* mContactSetCombo; - LLAvatarList* mAvatarList; + LLComboBox* mContactSetCombo{ nullptr }; + LLAvatarList* mAvatarList{ nullptr }; }; #endif // FS_PANELCONTACTSETS_H diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp index 607ccff3f8..9a620ba0af 100644 --- a/indra/newview/fsradar.cpp +++ b/indra/newview/fsradar.cpp @@ -98,8 +98,6 @@ FSRadar::FSRadar() : mNameFormatCallbackConnection(), mAgeAlertCallbackConnection() { - mRadarListUpdater = std::make_unique(std::bind(&FSRadar::updateRadarList, this)); - // Use the callback from LLAvatarNameCache here or we might update the names too early! LLAvatarNameCache::getInstance()->addUseDisplayNamesCallback(boost::bind(&FSRadar::updateNames, this)); mShowUsernamesCallbackConnection = gSavedSettings.getControl("NameTagShowUsernames")->getSignal()->connect(boost::bind(&FSRadar::updateNames, this)); @@ -126,6 +124,11 @@ FSRadar::~FSRadar() } } +void FSRadar::initSingleton() +{ + mRadarListUpdater = std::make_unique(std::bind(&FSRadar::updateRadarList, this)); +} + void FSRadar::radarAlertMsg(const LLUUID& agent_id, const LLAvatarName& av_name, std::string_view postMsg) { // Milkshake-style radar alerts diff --git a/indra/newview/fsradar.h b/indra/newview/fsradar.h index 8fbb20e5ed..ff7a7dd5e8 100644 --- a/indra/newview/fsradar.h +++ b/indra/newview/fsradar.h @@ -109,6 +109,9 @@ public: return mUpdateSignal.connect(cb); } +protected: + void initSingleton() override; + private: void updateRadarList(); void updateTracking(); diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi index 911185e04b..c301aa0e4e 100644 Binary files a/indra/newview/installers/windows/lang_en-us.nsi and b/indra/newview/installers/windows/lang_en-us.nsi differ diff --git a/indra/newview/lggcontactsets.cpp b/indra/newview/lggcontactsets.cpp index e4addd821f..f0605d06b3 100644 --- a/indra/newview/lggcontactsets.cpp +++ b/indra/newview/lggcontactsets.cpp @@ -39,12 +39,11 @@ #include "rlvactions.h" #include "rlvhandler.h" -const F32 COLOR_DAMPENING = 0.8f; +constexpr F32 COLOR_DAMPENING = 0.8f; const std::string CONTACT_SETS_FILE = "settings_friends_groups.xml"; const std::string CS_PSEUDONYM_QUOTED = "'--- ---'"; LGGContactSets::LGGContactSets() -: mDefaultColor(LLColor4::grey) { } @@ -73,15 +72,14 @@ void LGGContactSets::toneDownColor(LLColor4& color) const bool LGGContactSets::callbackAliasReset(const LLSD& notification, const LLSD& response) { - S32 option = LLNotification::getSelectedOption(notification, response); - if (option == 0) + if (S32 option = LLNotification::getSelectedOption(notification, response); option == 0) { clearPseudonym(notification["payload"]["agent_id"].asUUID()); } return false; } -std::string LGGContactSets::getFilename() +std::string LGGContactSets::getFilename() const { std::string path = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, ""); @@ -92,7 +90,7 @@ std::string LGGContactSets::getFilename() return path; } -std::string LGGContactSets::getDefaultFilename() +std::string LGGContactSets::getDefaultFilename() const { std::string path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""); @@ -107,8 +105,7 @@ LLSD LGGContactSets::exportContactSet(std::string_view set_name) { LLSD ret; - ContactSet* set = getContactSet(set_name); - if (set) + if (ContactSet* set = getContactSet(set_name); set) { ret["groupname"] = set->mName; ret["color"] = set->mColor.getValue(); @@ -199,27 +196,25 @@ LLSD LGGContactSets::exportToLLSD() output[CS_GLOBAL_SETTINGS]["defaultColor"] = mDefaultColor.getValue(); // Extra avatars - for (uuid_set_t::iterator it = mExtraAvatars.begin(); it != mExtraAvatars.end(); ++it) + for (const auto& avid : mExtraAvatars) { - output[CS_SET_EXTRA_AVS][(*it).asString()] = ""; + output[CS_SET_EXTRA_AVS][avid.asString()] = ""; } // Pseudonyms - for (uuid_map_t::iterator it = mPseudonyms.begin(); it != mPseudonyms.end(); ++it) + for (const auto& [avid, pseudonym] : mPseudonyms) { - output[CS_SET_PSEUDONYM][it->first.asString()] = it->second; + output[CS_SET_PSEUDONYM][avid.asString()] = pseudonym; } // Contact Sets - for (contact_set_map_t::iterator it = mContactSets.begin(); it != mContactSets.end(); ++it) + for (const auto& [name, set] : mContactSets) { - std::string name = it->first; - ContactSet* set = it->second; output[name]["color"] = set->mColor.getValue(); output[name]["notify"] = set->mNotify; - for (uuid_set_t::iterator friend_it = set->mFriends.begin(); friend_it != set->mFriends.end(); ++friend_it) + for (const auto& friend_id : set->mFriends) { - output[name]["friends"][(*friend_it).asString()] = ""; + output[name]["friends"][friend_id.asString()] = ""; } } @@ -300,10 +295,9 @@ void LGGContactSets::importFromLLSD(const LLSD& data) } } -LLColor4 LGGContactSets::getSetColor(std::string_view set_name) +LLColor4 LGGContactSets::getSetColor(std::string_view set_name) const { - ContactSet* set = getContactSet(set_name); - if (set) + if (ContactSet* set = getContactSet(set_name); set) { return set->mColor; } @@ -311,13 +305,12 @@ LLColor4 LGGContactSets::getSetColor(std::string_view set_name) return getDefaultColor(); }; -LLColor4 LGGContactSets::colorize(const LLUUID& uuid, const LLColor4& cur_color, ELGGCSType type) +LLColor4 LGGContactSets::colorize(const LLUUID& uuid, LLColor4 color, ELGGCSType type) const { static LLCachedControl legacy_radar_friend(gSavedSettings, "FSLegacyRadarFriendColoring"); static LLCachedControl legacy_radar_linden(gSavedSettings, "FSLegacyRadarLindenColoring"); bool rlv_shownames = !RlvActions::canShowName(RlvActions::SNC_DEFAULT, uuid); - LLColor4 color = cur_color; - + if (uuid == gAgentID) { switch (type) @@ -451,7 +444,7 @@ LLColor4 LGGContactSets::colorize(const LLUUID& uuid, const LLColor4& cur_color, return color; } -LLColor4 LGGContactSets::getFriendColor(const LLUUID& friend_id, std::string_view ignored_set_name) +LLColor4 LGGContactSets::getFriendColor(const LLUUID& friend_id, std::string_view ignored_set_name) const { LLColor4 color = getDefaultColor(); if (ignored_set_name == CS_SET_NO_SETS) @@ -460,8 +453,7 @@ LLColor4 LGGContactSets::getFriendColor(const LLUUID& friend_id, std::string_vie } U32 lowest = U32_MAX; - string_vec_t contact_sets = getFriendSets(friend_id); - for (const auto& set_name : contact_sets) + for (const auto& set_name : getFriendSets(friend_id)) { if (set_name != ignored_set_name) { @@ -474,7 +466,7 @@ LLColor4 LGGContactSets::getFriendColor(const LLUUID& friend_id, std::string_vie { lowest = set_size; - color = mContactSets[set_name]->mColor; + color = mContactSets.at(set_name)->mColor; if (isNonFriend(friend_id)) { toneDownColor(color); @@ -487,20 +479,20 @@ LLColor4 LGGContactSets::getFriendColor(const LLUUID& friend_id, std::string_vie { if (isFriendInSet(friend_id, ignored_set_name) && !isInternalSetName(ignored_set_name)) { - return mContactSets[ignored_set_name.data()]->mColor; + return mContactSets.at(ignored_set_name.data())->mColor; } } return color; } -bool LGGContactSets::hasFriendColorThatShouldShow(const LLUUID& friend_id, ELGGCSType type) +bool LGGContactSets::hasFriendColorThatShouldShow(const LLUUID& friend_id, ELGGCSType type) const { LLColor4 color = LLColor4::white; return hasFriendColorThatShouldShow(friend_id, type, color); } // handle all settings and rlv that would prevent us from showing the cs color -bool LGGContactSets::hasFriendColorThatShouldShow(const LLUUID& friend_id, ELGGCSType type, LLColor4& color) +bool LGGContactSets::hasFriendColorThatShouldShow(const LLUUID& friend_id, ELGGCSType type, LLColor4& color) const { if (!RlvActions::canShowName(RlvActions::SNC_DEFAULT, friend_id)) { @@ -551,7 +543,7 @@ bool LGGContactSets::hasFriendColorThatShouldShow(const LLUUID& friend_id, ELGGC return true; } -string_vec_t LGGContactSets::getFriendSets(const LLUUID& friend_id) +string_vec_t LGGContactSets::getFriendSets(const LLUUID& friend_id) const { string_vec_t sets{}; @@ -565,7 +557,7 @@ string_vec_t LGGContactSets::getFriendSets(const LLUUID& friend_id) return sets; } -uuid_vec_t LGGContactSets::getFriendsInSet(std::string_view set_name) +uuid_vec_t LGGContactSets::getFriendsInSet(std::string_view set_name) const { uuid_vec_t friends; @@ -586,8 +578,7 @@ uuid_vec_t LGGContactSets::getFriendsInSet(std::string_view set_name) return getListOfNonFriends(); } - ContactSet* set = getContactSet(set_name); - if (set) + if (ContactSet* set = getContactSet(set_name); set) { for (const auto& id : set->mFriends) { @@ -598,7 +589,7 @@ uuid_vec_t LGGContactSets::getFriendsInSet(std::string_view set_name) return friends; } -string_vec_t LGGContactSets::getAllContactSets() +string_vec_t LGGContactSets::getAllContactSets() const { string_vec_t sets{}; @@ -610,7 +601,7 @@ string_vec_t LGGContactSets::getAllContactSets() return sets; } -uuid_vec_t LGGContactSets::getFriendsInAnySet() +uuid_vec_t LGGContactSets::getFriendsInAnySet() const { uuid_set_t friendsInAnySet{}; @@ -625,9 +616,9 @@ uuid_vec_t LGGContactSets::getFriendsInAnySet() return uuid_vec_t(friendsInAnySet.begin(), friendsInAnySet.end()); } -bool LGGContactSets::isFriendInSet(const LLUUID& friend_id) +bool LGGContactSets::isFriendInAnySet(const LLUUID& friend_id) const { - for (const auto& [set_name, set] : mContactSets) + for (const auto& [set_name, set] : mContactSets) { if (set->hasFriend(friend_id)) { @@ -638,15 +629,15 @@ bool LGGContactSets::isFriendInSet(const LLUUID& friend_id) return false; } -bool LGGContactSets::isFriendInSet(const LLUUID& friend_id, std::string_view set_name) +bool LGGContactSets::isFriendInSet(const LLUUID& friend_id, std::string_view set_name) const { if (set_name == CS_SET_ALL_SETS) { - return isFriendInSet(friend_id); + return isFriendInAnySet(friend_id); } else if (set_name == CS_SET_NO_SETS) { - return !isFriendInSet(friend_id); + return !isFriendInAnySet(friend_id); } else if (set_name == CS_SET_PSEUDONYM) { @@ -660,8 +651,7 @@ bool LGGContactSets::isFriendInSet(const LLUUID& friend_id, std::string_view set if( set_name.empty() ) return false; - ContactSet* set = getContactSet(set_name); - if (set) + if (ContactSet* set = getContactSet(set_name); set) { return set->hasFriend(friend_id); } @@ -669,12 +659,11 @@ bool LGGContactSets::isFriendInSet(const LLUUID& friend_id, std::string_view set return false; } -bool LGGContactSets::notifyForFriend(const LLUUID& friend_id) +bool LGGContactSets::notifyForFriend(const LLUUID& friend_id) const { - string_vec_t sets = getFriendSets(friend_id); - for (const auto& set_name : sets) + for (const auto& set_name : getFriendSets(friend_id)) { - if (mContactSets[set_name]->mNotify) + if (mContactSets.at(set_name)->mNotify) { return true; } @@ -706,8 +695,7 @@ void LGGContactSets::addToSet(const uuid_vec_t& avatar_ids, std::string_view set void LGGContactSets::removeNonFriendFromList(const LLUUID& non_friend_id, bool save_changes /*= true*/) { LLAvatarTracker& tracker = LLAvatarTracker::instance(); - uuid_set_t::iterator found = mExtraAvatars.find(non_friend_id); - if (found != mExtraAvatars.end()) + if (auto found = mExtraAvatars.find(non_friend_id); found != mExtraAvatars.end()) { mExtraAvatars.erase(found); @@ -727,14 +715,13 @@ void LGGContactSets::removeNonFriendFromList(const LLUUID& non_friend_id, bool s void LGGContactSets::removeFriendFromAllSets(const LLUUID& friend_id, bool save_changes /*= true*/) { - string_vec_t sets = getFriendSets(friend_id); - for (const auto& set_name : sets) + for (const auto& set_name : getFriendSets(friend_id)) { removeFriendFromSet(friend_id, set_name, save_changes); } } -bool LGGContactSets::isNonFriend(const LLUUID& non_friend_id) +bool LGGContactSets::isNonFriend(const LLUUID& non_friend_id) const { if (LLAvatarTracker::instance().isBuddy(non_friend_id)) { @@ -744,7 +731,7 @@ bool LGGContactSets::isNonFriend(const LLUUID& non_friend_id) return (mExtraAvatars.find(non_friend_id) != mExtraAvatars.end()); } -uuid_vec_t LGGContactSets::getListOfNonFriends() +uuid_vec_t LGGContactSets::getListOfNonFriends() const { LLAvatarTracker& tracker = LLAvatarTracker::instance(); uuid_vec_t nonfriends{}; @@ -760,7 +747,7 @@ uuid_vec_t LGGContactSets::getListOfNonFriends() return nonfriends; } -uuid_vec_t LGGContactSets::getListOfPseudonymAvs() +uuid_vec_t LGGContactSets::getListOfPseudonymAvs() const { uuid_vec_t pseudonyms{}; @@ -780,8 +767,7 @@ void LGGContactSets::setPseudonym(const LLUUID& friend_id, std::string_view pseu inst->fetch(friend_id); LLVOAvatar::invalidateNameTag(friend_id); - avatar_name_cache_connection_map_t::iterator it = mAvatarNameCacheConnections.find(friend_id); - if (it != mAvatarNameCacheConnections.end()) + if (auto it = mAvatarNameCacheConnections.find(friend_id); it != mAvatarNameCacheConnections.end()) { if (it->second.connected()) { @@ -793,10 +779,9 @@ void LGGContactSets::setPseudonym(const LLUUID& friend_id, std::string_view pseu saveToDisk(); } -std::string LGGContactSets::getPseudonym(const LLUUID& friend_id) +std::string LGGContactSets::getPseudonym(const LLUUID& friend_id) const { - uuid_map_t::iterator found = mPseudonyms.find(friend_id); - if (found != mPseudonyms.end()) + if (auto found = mPseudonyms.find(friend_id); found != mPseudonyms.end()) { return llformat("'%s'", found->second.c_str()); } @@ -805,8 +790,7 @@ std::string LGGContactSets::getPseudonym(const LLUUID& friend_id) void LGGContactSets::clearPseudonym(const LLUUID& friend_id, bool save_changes /*= true*/) { - uuid_map_t::iterator found = mPseudonyms.find(friend_id); - if (found != mPseudonyms.end()) + if (auto found = mPseudonyms.find(friend_id); found != mPseudonyms.end()) { mPseudonyms.erase(found); LLAvatarNameCache* inst = LLAvatarNameCache::getInstance(); @@ -818,8 +802,7 @@ void LGGContactSets::clearPseudonym(const LLUUID& friend_id, bool save_changes / removeNonFriendFromList(friend_id, save_changes); } - avatar_name_cache_connection_map_t::iterator it = mAvatarNameCacheConnections.find(friend_id); - if (it != mAvatarNameCacheConnections.end()) + if (auto it = mAvatarNameCacheConnections.find(friend_id); it != mAvatarNameCacheConnections.end()) { if (it->second.connected()) { @@ -837,8 +820,7 @@ void LGGContactSets::clearPseudonym(const LLUUID& friend_id, bool save_changes / void LGGContactSets::onAvatarNameCache(const LLUUID& av_id) { - avatar_name_cache_connection_map_t::iterator it = mAvatarNameCacheConnections.find(av_id); - if (it != mAvatarNameCacheConnections.end()) + if (auto it = mAvatarNameCacheConnections.find(av_id); it != mAvatarNameCacheConnections.end()) { if (it->second.connected()) { @@ -849,12 +831,12 @@ void LGGContactSets::onAvatarNameCache(const LLUUID& av_id) mChangedSignal(UPDATED_MEMBERS); } -bool LGGContactSets::hasPseudonym(const LLUUID& friend_id) +bool LGGContactSets::hasPseudonym(const LLUUID& friend_id) const { return (!getPseudonym(friend_id).empty()); } -bool LGGContactSets::hasPseudonym(uuid_vec_t ids) +bool LGGContactSets::hasPseudonym(const uuid_vec_t& ids) const { bool has_pseudonym = false; for (const auto& id : ids) @@ -868,12 +850,12 @@ bool LGGContactSets::hasPseudonym(uuid_vec_t ids) return has_pseudonym; } -bool LGGContactSets::hasDisplayNameRemoved(const LLUUID& friend_id) +bool LGGContactSets::hasDisplayNameRemoved(const LLUUID& friend_id) const { return (getPseudonym(friend_id) == CS_PSEUDONYM_QUOTED); } -bool LGGContactSets::hasDisplayNameRemoved(uuid_vec_t ids) +bool LGGContactSets::hasDisplayNameRemoved(const uuid_vec_t& ids) const { bool has_pseudonym = false; for (const auto& id : ids) @@ -887,7 +869,7 @@ bool LGGContactSets::hasDisplayNameRemoved(uuid_vec_t ids) return has_pseudonym; } -bool LGGContactSets::hasVisuallyDifferentPseudonym(const LLUUID& friend_id) +bool LGGContactSets::hasVisuallyDifferentPseudonym(const LLUUID& friend_id) const { return (hasPseudonym(friend_id) && (!hasDisplayNameRemoved(friend_id))); } @@ -908,8 +890,7 @@ void LGGContactSets::removeFriendFromSet(const LLUUID& friend_id, std::string_vi return clearPseudonym(friend_id, save_changes); } - ContactSet* set = getContactSet(set_name); - if (set) + if (ContactSet* set = getContactSet(set_name); set) { set->mFriends.erase(friend_id); if (save_changes) @@ -920,7 +901,7 @@ void LGGContactSets::removeFriendFromSet(const LLUUID& friend_id, std::string_vi } } -bool LGGContactSets::isValidSet(std::string_view set_name) +bool LGGContactSets::isValidSet(std::string_view set_name) const { return (mContactSets.find(set_name.data()) != mContactSets.end()); } @@ -995,10 +976,9 @@ void LGGContactSets::setNotifyForSet(std::string_view set_name, bool notify) } } -bool LGGContactSets::getNotifyForSet(std::string_view set_name) +bool LGGContactSets::getNotifyForSet(std::string_view set_name) const { - ContactSet* set = getContactSet(set_name); - if (set) + if (ContactSet* set = getContactSet(set_name); set) { return set->mNotify; } @@ -1007,15 +987,14 @@ bool LGGContactSets::getNotifyForSet(std::string_view set_name) void LGGContactSets::setSetColor(std::string_view set_name, const LLColor4& color) { - ContactSet* set = getContactSet(set_name); - if (set) + if (ContactSet* set = getContactSet(set_name); set) { set->mColor = color; saveToDisk(); } } -bool LGGContactSets::isInternalSetName(std::string_view set_name) +bool LGGContactSets::isInternalSetName(std::string_view set_name) const { return (set_name.empty() || set_name == CS_SET_EXTRA_AVS || @@ -1025,7 +1004,7 @@ bool LGGContactSets::isInternalSetName(std::string_view set_name) set_name == CS_GLOBAL_SETTINGS); } -LGGContactSets::ContactSet* LGGContactSets::getContactSet(std::string_view set_name) +LGGContactSets::ContactSet* LGGContactSets::getContactSet(std::string_view set_name) const { if (set_name.empty()) { @@ -1033,8 +1012,7 @@ LGGContactSets::ContactSet* LGGContactSets::getContactSet(std::string_view set_n return nullptr; } - contact_set_map_t::iterator found = mContactSets.find(set_name.data()); - if (found != mContactSets.end()) + if (auto found = mContactSets.find(set_name.data()); found != mContactSets.end()) { return found->second; } @@ -1042,7 +1020,7 @@ LGGContactSets::ContactSet* LGGContactSets::getContactSet(std::string_view set_n return nullptr; } -bool LGGContactSets::checkCustomName(const LLUUID& id, bool& dn_removed, std::string& pseudonym) +bool LGGContactSets::checkCustomName(const LLUUID& id, bool& dn_removed, std::string& pseudonym) const { dn_removed = hasDisplayNameRemoved(id); pseudonym = getPseudonym(id); @@ -1052,8 +1030,7 @@ bool LGGContactSets::checkCustomName(const LLUUID& id, bool& dn_removed, std::st // static bool LGGContactSets::handleAddContactSetCallback(const LLSD& notification, const LLSD& response) { - S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - if (option == 0) + if (S32 option = LLNotificationsUtil::getSelectedOption(notification, response); option == 0) { const std::string set_name = response["message"].asString(); LGGContactSets::getInstance()->addSet(set_name); @@ -1064,8 +1041,7 @@ bool LGGContactSets::handleAddContactSetCallback(const LLSD& notification, const // static bool LGGContactSets::handleRemoveContactSetCallback(const LLSD& notification, const LLSD& response) { - S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - if (option == 0) + if (S32 option = LLNotificationsUtil::getSelectedOption(notification, response); option == 0) { LGGContactSets::getInstance()->removeSet(notification["payload"]["contact_set"].asString()); } @@ -1075,8 +1051,7 @@ bool LGGContactSets::handleRemoveContactSetCallback(const LLSD& notification, co // static bool LGGContactSets::handleRemoveAvatarFromSetCallback(const LLSD& notification, const LLSD& response) { - S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - if (option == 0) + if (S32 option = LLNotificationsUtil::getSelectedOption(notification, response); option == 0) { LGGContactSets& instance = LGGContactSets::instance(); LLAvatarTracker& tracker = LLAvatarTracker::instance(); @@ -1085,7 +1060,7 @@ bool LGGContactSets::handleRemoveAvatarFromSetCallback(const LLSD& notification, it != notification["payload"]["ids"].endArray(); ++it) { - LLUUID id = it->asUUID(); + const LLUUID& id = it->asUUID(); std::string set_name = notification["payload"]["contact_set"].asString(); instance.removeFriendFromSet(id, set_name, false); @@ -1107,8 +1082,7 @@ bool LGGContactSets::handleRemoveAvatarFromSetCallback(const LLSD& notification, // static bool LGGContactSets::handleSetAvatarPseudonymCallback(const LLSD& notification, const LLSD& response) { - S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - if (option == 0) + if (S32 option = LLNotificationsUtil::getSelectedOption(notification, response); option == 0) { const std::string pseudonym(response["message"].asString()); const LLUUID id(notification["payload"]["id"].asUUID()); diff --git a/indra/newview/lggcontactsets.h b/indra/newview/lggcontactsets.h index c7607c4b57..61843d167a 100644 --- a/indra/newview/lggcontactsets.h +++ b/indra/newview/lggcontactsets.h @@ -22,9 +22,9 @@ #include "v4color.h" #include "llsingleton.h" +#include +#include #include -#include -#include typedef enum e_lgg_cs { @@ -51,63 +51,63 @@ class LGGContactSets : public LLSingleton public: typedef std::vector string_vec_t; - typedef boost::unordered_set uuid_set_t; + typedef std::unordered_set uuid_set_t; void loadFromDisk(); void setSetColor(std::string_view set_name, const LLColor4& color); - LLColor4 getSetColor(std::string_view set_name); - LLColor4 getFriendColor(const LLUUID& friend_id, std::string_view ignored_set_name = ""); - LLColor4 colorize(const LLUUID& uuid, const LLColor4& cur_color, ELGGCSType type); + LLColor4 getSetColor(std::string_view set_name) const; + LLColor4 getFriendColor(const LLUUID& friend_id, std::string_view ignored_set_name = "") const; + LLColor4 colorize(const LLUUID& uuid, LLColor4 color, ELGGCSType type) const; void setDefaultColor(const LLColor4& default_color) { mDefaultColor = default_color; }; - LLColor4 getDefaultColor() { return mDefaultColor; }; + LLColor4 getDefaultColor() const { return mDefaultColor; }; - std::string getPseudonym(const LLUUID& friend_id); - bool hasPseudonym(const LLUUID& friend_id); - bool hasPseudonym(uuid_vec_t ids); + std::string getPseudonym(const LLUUID& friend_id) const; + bool hasPseudonym(const LLUUID& friend_id) const; + bool hasPseudonym(const uuid_vec_t& ids) const; void clearPseudonym(const LLUUID& friend_id, bool save_changes = true); void removeDisplayName(const LLUUID& friend_id); - bool hasDisplayNameRemoved(const LLUUID& friend_id); - bool hasDisplayNameRemoved(uuid_vec_t ids); + bool hasDisplayNameRemoved(const LLUUID& friend_id) const; + bool hasDisplayNameRemoved(const uuid_vec_t& ids) const; - bool checkCustomName(const LLUUID& id, bool& dn_removed, std::string& pseudonym); + bool checkCustomName(const LLUUID& id, bool& dn_removed, std::string& pseudonym) const; - string_vec_t getFriendSets(const LLUUID& friend_id); - string_vec_t getAllContactSets(); + string_vec_t getFriendSets(const LLUUID& friend_id) const; + string_vec_t getAllContactSets() const; void addToSet(const uuid_vec_t&, std::string_view set_name); void removeFriendFromSet(const LLUUID& friend_id, std::string_view set_name, bool save_changes = true); void removeFriendFromAllSets(const LLUUID& friend_id, bool save_changes = true); - bool isFriendInSet(const LLUUID& friend_id, std::string_view set_name); - bool hasFriendColorThatShouldShow(const LLUUID& friend_id, ELGGCSType type); - bool hasFriendColorThatShouldShow(const LLUUID& friend_id, ELGGCSType type, LLColor4& color); + bool isFriendInSet(const LLUUID& friend_id, std::string_view set_name) const; + bool hasFriendColorThatShouldShow(const LLUUID& friend_id, ELGGCSType type) const; + bool hasFriendColorThatShouldShow(const LLUUID& friend_id, ELGGCSType type, LLColor4& color) const; void addSet(std::string_view set_name); bool renameSet(std::string_view set_name, std::string_view new_set_name); void removeSet(std::string_view set_name); - bool isValidSet(std::string_view set_name); + bool isValidSet(std::string_view set_name) const; void removeNonFriendFromList(const LLUUID& non_friend_id, bool save_changes = true); - bool isNonFriend(const LLUUID& non_friend_id); - bool isFriendInSet(const LLUUID& friend_id); - uuid_vec_t getListOfNonFriends(); - uuid_vec_t getListOfPseudonymAvs(); + bool isNonFriend(const LLUUID& non_friend_id) const; + bool isFriendInAnySet(const LLUUID& friend_id) const; + uuid_vec_t getListOfNonFriends() const; + uuid_vec_t getListOfPseudonymAvs() const; - bool notifyForFriend(const LLUUID& friend_id); + bool notifyForFriend(const LLUUID& friend_id) const; void setNotifyForSet(std::string_view set_name, bool notify); - bool getNotifyForSet(std::string_view set_name); + bool getNotifyForSet(std::string_view set_name) const; bool callbackAliasReset(const LLSD& notification, const LLSD& response); - bool isInternalSetName(std::string_view set_name); - bool hasSets() { return !mContactSets.empty(); } + bool isInternalSetName(std::string_view set_name) const; + bool hasSets() const { return !mContactSets.empty(); } class ContactSet { public: - bool hasFriend(const LLUUID& avatar_id) + bool hasFriend(const LLUUID& avatar_id) const { return (mFriends.find(avatar_id) != mFriends.end()); } @@ -117,7 +117,7 @@ public: bool mNotify; LLColor4 mColor; }; - ContactSet* getContactSet(std::string_view set_name); + ContactSet* getContactSet(std::string_view set_name) const; // [FS:CR] Signals for updating the various UI typedef enum e_contact_set_update { @@ -140,27 +140,27 @@ public: private: void toneDownColor(LLColor4& color) const; - uuid_vec_t getFriendsInSet(std::string_view set_name); - uuid_vec_t getFriendsInAnySet(); + uuid_vec_t getFriendsInSet(std::string_view set_name) const; + uuid_vec_t getFriendsInAnySet() const; void setPseudonym(const LLUUID& friend_id, std::string_view pseudonym); - bool hasVisuallyDifferentPseudonym(const LLUUID& friend_id); + bool hasVisuallyDifferentPseudonym(const LLUUID& friend_id) const; LLSD exportContactSet(std::string_view set_name); bool saveContactSetToDisk(std::string_view set_name, std::string_view filename); - std::string getFilename(); - std::string getDefaultFilename(); + std::string getFilename() const; + std::string getDefaultFilename() const; void importFromLLSD(const LLSD& data); LLSD exportToLLSD(); void saveToDisk(); - typedef boost::unordered_map uuid_map_t; + typedef std::unordered_map uuid_map_t; typedef std::map contact_set_map_t; contact_set_map_t mContactSets; - LLColor4 mDefaultColor; + LLColor4 mDefaultColor{ LLColor4::grey }; uuid_set_t mExtraAvatars; uuid_map_t mPseudonyms; diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 3505dce54f..c65fdec192 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -1141,7 +1141,18 @@ void LLEnvironment::onRegionChange() } if (!cur_region->capabilitiesReceived()) { +// GCC13 warning: maybe-uninitialized - probably bogus +#if defined(__GNUC__) && (__GNUC__ >= 13) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif +// cur_region->setCapabilitiesReceivedCallback([](const LLUUID ®ion_id, LLViewerRegion* regionp) { LLEnvironment::instance().requestRegion(); }); +// GCC13 warning: maybe-uninitialized - probably bogus +#if defined(__GNUC__) && (__GNUC__ >= 13) +#pragma GCC diagnostic pop +#endif +// return; } requestRegion(); diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index e52500ce3f..255b7d1038 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -2130,8 +2130,18 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, LLVector4a t; tangent_to_object.rotate(binormal_dir, t); LLVector4a binormal; +// GCC13 warning: maybe-uninitialized - probably bogus +#if defined(__GNUC__) && (__GNUC__ >= 13) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif +// mat_normal.rotate(t, binormal); - +// +#if defined(__GNUC__) && (__GNUC__ >= 13) +#pragma GCC diagnostic pop +#endif +// //VECTORIZE THIS if (mDrawablep->isActive()) { diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index c9ed2693f4..2fe08b39f5 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -7495,11 +7495,19 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) std::string submenu_name = attachment->getName(); if (LLTrans::getString(submenu_name) != "") { - p.name = (" ")+LLTrans::getString(submenu_name)+" "; + // Add attachment point ID to non-HUD attachment spots + if (attachment->getIsHUDAttachment()) + p.name = (" ")+LLTrans::getString(submenu_name)+" "; + else + p.name = (" ") + LLTrans::getString(submenu_name) + " (" + std::to_string(curiter->first) + ")" + " "; } else { - p.name = submenu_name; + if (attachment->getIsHUDAttachment()) + p.name = submenu_name; + else + p.name = submenu_name + " (" + std::to_string(curiter->first) + ")"; + // } LLSD cbparams; cbparams["index"] = curiter->first; diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index 36ad815e51..2236066267 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -2523,7 +2523,7 @@ void LLModelPreview::genMeshOptimizerLODs(S32 which_lod, S32 meshopt_mode, U32 d out << "Invalid level of detail: " << which_lod; LL_WARNS() << out.str() << LL_ENDL; LLFloaterModelPreview::addStringToLog(out, true); // if you don't flash the log tab on error when do you? - assert(lod >= -1 && lod < LLModel::NUM_LODS); + assert(which_lod >= -1 && which_lod < LLModel::NUM_LODS); // use the correct variable (which_lod). return; } diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 770bb43f3e..a427845ed6 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -1852,7 +1852,7 @@ void LLPanelPeople::generateContactList(const std::string& contact_set) ++buddy) { // Only show our buddies who aren't in a set, by request. - if (!LGGContactSets::getInstance()->isFriendInSet(buddy->first)) + if (!LGGContactSets::getInstance()->isFriendInAnySet(buddy->first)) avatars.push_back(buddy->first); } } @@ -1862,10 +1862,12 @@ void LLPanelPeople::generateContactList(const std::string& contact_set) } else if (!LGGContactSets::getInstance()->isInternalSetName(contact_set)) { - LGGContactSets::ContactSet* group = LGGContactSets::getInstance()->getContactSet(contact_set); - for (auto const& id : group->mFriends) + if (LGGContactSets::ContactSet* group = LGGContactSets::getInstance()->getContactSet(contact_set); group) { - avatars.push_back(id); + for (auto const& id : group->mFriends) + { + avatars.push_back(id); + } } } mContactSetList->setDirty(); diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index 1d21442d89..d538519005 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -370,12 +370,16 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n // Graphic preset controls independent from XUI // Add the controls not in feature table to the default preset with their current value - for (std::vector::iterator it = mGraphicPresetControls.begin(); it != mGraphicPresetControls.end(); ++it) + for (const auto& ctrl_name : mGraphicPresetControls) { - std::string ctrl_name = *it; if (!paramsData.has(ctrl_name)) { LLControlVariable* ctrl = gSavedSettings.getControl(ctrl_name).get(); + if (!ctrl) + { + LL_WARNS() << "Presets setting list contains non-existing setting: " << ctrl_name << LL_ENDL; + continue; + } std::string comment = ctrl->getComment(); std::string type = LLControlGroup::typeEnumToString(ctrl->type()); LLSD value = ctrl->getValue(); diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index 0a78718bae..492e6579e9 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -431,7 +431,7 @@ public: std::string region_name = LLURI::unescape(tokens[0]); - std::string callback_url = LLSLURL(url_grid, region_name, coords).getSLURLString(); + std::string callback_url = LLSLURL(grid, region_name, coords).getSLURLString(); #endif // OPENSIM // diff --git a/indra/newview/llviewerattachmenu.cpp b/indra/newview/llviewerattachmenu.cpp index cce9a5f7a4..3a42291325 100644 --- a/indra/newview/llviewerattachmenu.cpp +++ b/indra/newview/llviewerattachmenu.cpp @@ -69,11 +69,19 @@ void LLViewerAttachMenu::populateMenus(const std::string& attach_to_menu_name, c if (LLTrans::findString(translated_submenu_name, submenu_name)) { - p.name = (" ") + translated_submenu_name + " "; + // Add attachment point ID to non-HUD attachment spots + if (attachment->getIsHUDAttachment()) + p.name = (" ") + translated_submenu_name + " "; + else + p.name = (" ") + translated_submenu_name + " (" + std::to_string(curiter->first) + ")" + " "; } else { - p.name = submenu_name; + if (attachment->getIsHUDAttachment()) + p.name = submenu_name; + else + p.name = submenu_name + " (" + std::to_string(curiter->first) + ")"; + // } LLSD cbparams; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 9a08d3809b..b946a3bad6 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -224,7 +224,8 @@ // [FS communication UI] #include "llwindowlistener.h" #include "llviewerwindowlistener.h" -#include "llpaneltopinfobar.h" +// We don't use the mini location panel in Firestorm +// #include "llpaneltopinfobar.h" #include "llcleanup.h" #include "llimview.h" #include "llviewermenufile.h" diff --git a/indra/newview/skins/default/xui/az/floater_perm_prefs.xml b/indra/newview/skins/default/xui/az/floater_perm_prefs.xml deleted file mode 100644 index c63237bddd..0000000000 --- a/indra/newview/skins/default/xui/az/floater_perm_prefs.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - Yeni sahibin icazəsi var: - - - - - - - - - - - - - - Tuning Strategy - - - - - - - - - Graphics settings - - - Choose settings for distance, water, lighting and more. - - - - - - Avatars nearby - - - Manage which nearby avatars are fully displayed. - - -Time spent -drawing -avatars - - - 00% - - - - - - Your avatar complexity - - - Be a good citizen. Manage the impact of your avatar - - - - - - Your active HUDs - - - Removing unnecessary HUDs may improve speed. - - -Time spent -drawing -HUDs - - - 00% - - - + bevel_style="none" + follows="left|top" + height="540" + width="580" + name="panel_performance_main" + visible="true" + layout="topleft" + left="0" + top="60"> + + Auto-adjust settings (recommended) + + + Allow automatic adjustments to reach your preferred frame rate. + + + + + + Graphics settings + + + Choose settings for distance, water, lighting and more. + + + + - Preferred frame rate + width="205"> + Avatars nearby - Allow automatic adjustments to reach your preferred frame rate (advanced). + width="395"> + Manage which nearby avatars are fully displayed. + + + + + + Your avatar complexity + + + Reduce the complexity of your avatar if you aren't satisfied with current FPS. + + + + + + Your active HUDs + + + Removing HUDs you are not using can improve speed. + filename="panel_performance_nearby.xml" + follows="all" + layout="topleft" + left="0" + name="panel_performance_nearby" + visible="false" + top="55" /> + filename="panel_performance_complexity.xml" + follows="all" + layout="topleft" + left="0" + name="panel_performance_complexity" + visible="false" + top="55" /> + filename="panel_performance_preferences.xml" + follows="all" + layout="topleft" + left="0" + name="panel_performance_preferences" + visible="false" + top="55" /> - - - - - - Next owner can: - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml deleted file mode 100755 index 1e4549c26d..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - Następny Właściciel: - - - - - -