diff --git a/autobuild.xml b/autobuild.xml index 349981f711..8da928b839 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -850,9 +850,9 @@ archive hash - 2b29e6435ea9487bc2019a28b8287d6a + 7b8fd7a8ea9850f1cad187059d2da4af url - http://3p.firestormviewer.org/dullahan-1.8.0.202011061705_81.3.10_gb223419_chromium-81.0.4044.138-linux64-203111605.tar.bz2 + http://3p.firestormviewer.org/dullahan-1.12.2.202109131147_91.1.23_g04c8d56_chromium-91.0.4472.164-linux64-212560947.tar.bz2 name linux64 @@ -1932,9 +1932,9 @@ archive hash - 3b8b0f54c851f136e2a92e1c6ba724a5 + e99b86fc3ed48a778580dd1449f8f33b url - file:///opt/firestorm/kdu-8.1-darwin64-211970151.tar.bz2 + file:///opt/firestorm/kdu-8.2-darwin-212431232.tar.bz2 name darwin64 @@ -1944,9 +1944,9 @@ archive hash - dce2cc624e216eb991412ec0c5538cf9 + 94f8c766d77d68e0b8b1ac783b6a02dc url - file:///opt/firestorm/kdu-8.1-linux64-210652339.tar.bz2 + file:///opt/firestorm/kdu-8.2-linux64-212351600.tar.bz2 name linux64 @@ -1956,9 +1956,9 @@ archive hash - 1cd284c85b5f05fff6b286e85b55ebf2 + e88372fa10b83c6900443dcc12c12338 url - file:///c:/cygwin/opt/firestorm/kdu-8.1-windows-210862059.tar.bz2 + file:///c:/cygwin/opt/firestorm/kdu-8.2-windows-212351246.tar.bz2 name windows @@ -1968,9 +1968,9 @@ archive hash - 1cd284c85b5f05fff6b286e85b55ebf2 + e88372fa10b83c6900443dcc12c12338 url - file:///c:/cygwin/opt/firestorm/kdu-8.1-windows-210862059.tar.bz2 + file:///c:/cygwin/opt/firestorm/kdu-8.2-windows-212351246.tar.bz2 name windows64 diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp index e126a24c00..589213733a 100644 --- a/indra/llfilesystem/lldiskcache.cpp +++ b/indra/llfilesystem/lldiskcache.cpp @@ -71,7 +71,7 @@ LLDiskCache::LLDiskCache(const std::string cache_dir, void LLDiskCache::purge() { - //if (mEnableCacheDebugInfo) + if (mEnableCacheDebugInfo) { LL_INFOS() << "Total dir size before purge is " << dirFileSize(mCacheDir) << LL_ENDL; } @@ -93,7 +93,7 @@ void LLDiskCache::purge() //for (auto& entry : boost::make_iterator_range(boost::filesystem::directory_iterator(cache_path, ec), {})) for (auto& entry : boost::make_iterator_range(boost::filesystem::recursive_directory_iterator(cache_path, ec), {})) { - if (boost::filesystem::is_regular_file(entry, ec) && !ec.failed()) + if (!ec.failed() && (boost::filesystem::is_regular_file(entry, ec) && !ec.failed())) { if (entry.path().string().find(mCacheFilenamePrefix) != std::string::npos) { @@ -181,7 +181,7 @@ void LLDiskCache::purge() } } - //if (mEnableCacheDebugInfo) + if (mEnableCacheDebugInfo) { auto end_time = std::chrono::high_resolution_clock::now(); auto execute_time = std::chrono::duration_cast(end_time - start_time).count(); @@ -485,7 +485,7 @@ uintmax_t LLDiskCache::dirFileSize(const std::string dir) //for (auto& entry : boost::make_iterator_range(boost::filesystem::directory_iterator(dir_path, ec), {})) for (auto& entry : boost::make_iterator_range(boost::filesystem::recursive_directory_iterator(dir_path, ec), {})) { - if (boost::filesystem::is_regular_file(entry, ec) && !ec.failed()) + if (!ec.failed() && (boost::filesystem::is_regular_file(entry, ec) && !ec.failed())) { if (entry.path().string().find(mCacheFilenamePrefix) != std::string::npos) { diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp index e1e7863cca..7ee9c4f777 100644 --- a/indra/llkdu/llimagej2ckdu.cpp +++ b/indra/llkdu/llimagej2ckdu.cpp @@ -321,7 +321,12 @@ void LLImageJ2CKDU::setupCodeStream(LLImageJ2C &base, bool keep_codestream, ECod // *TODO: This seems to be wrong. The base class should have no idea of // how j2c compression works so no good way of computing what's the byte // range to be used. +#if (KDU_MAJOR_VERSION*10000 + KDU_MINOR_VERSION*100 + KDU_PATCH_VERSION) >= 80200 + mCodeStreamp->set_max_bytes(max_bytes, false); +#else mCodeStreamp->set_max_bytes(max_bytes,true); +#endif + // If you want to flip or rotate the image for some reason, change // the resolution, or identify a restricted region of interest, this is diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 98c0919800..f1501cbd73 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -1905,7 +1905,9 @@ BOOL LLScrollListCtrl::handleToolTip(S32 x, S32 y, MASK mask) LLScrollListCell* hit_cell = hit_item->getColumn(column_index); if (!hit_cell) return FALSE; if (hit_cell - && hit_cell->isText() + // Why would we restrict tool tips to text fields only? + // Having them on non-text fields seems really useful + // && hit_cell->isText() && hit_cell->needsToolTip()) { S32 row_index = getItemIndex(hit_item); diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 1086c98de9..00c707af39 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -141,6 +141,10 @@ MediaPluginBase(host_send_func, host_user_data) mPickedFiles.clear(); mCurVolume = 0.0; +#ifdef LL_LINUX + mDisableGPU = true; +#endif + mCEFLib = new dullahan(); setVolume(); @@ -1010,12 +1014,7 @@ void MediaPluginCEF::checkEditState() void MediaPluginCEF::setVolume() { - //mVolumeCatcher.setVolume(mCurVolume); -#if 0//(DULLAHAN_VERSION_MAJOR*100 + DULLAHAN_VERSION_MINOR) >= 108 - mCEFLib->setVolume(mCurVolume); -#else mVolumeCatcher.setVolume(mCurVolume); -#endif } //////////////////////////////////////////////////////////////////////////////// diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 61780dd48a..9397168fe7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -612,7 +612,7 @@ set(viewer_SOURCE_FILES llpanelteleporthistory.cpp llpaneltiptoast.cpp llpanelvoiceeffect.cpp - llpaneltopinfobar.cpp + #llpaneltopinfobar.cpp # unused llpanelpulldown.cpp llpanelvoicedevicesettings.cpp llpanelvolume.cpp @@ -1378,7 +1378,7 @@ set(viewer_HEADER_FILES llpanelpulldown.h llpanelvoicedevicesettings.h llpanelvoiceeffect.h - llpaneltopinfobar.h + #llpaneltopinfobar.h # unused llpanelvolume.h llpanelvolumepulldown.h llpanelwearing.h diff --git a/indra/newview/app_settings/grids.xml b/indra/newview/app_settings/grids.xml index 6541975346..2a2e599f07 100644 --- a/indra/newview/app_settings/grids.xml +++ b/indra/newview/app_settings/grids.xml @@ -953,7 +953,7 @@ agent loginpage - http://phoenixviewer.com/app/loginV3/ + https://phoenixviewer.com/app/loginV3/ loginuri https://login.aditi.lindenlab.com/cgi-bin/login.cgi @@ -986,7 +986,7 @@ agent loginpage - http://phoenixviewer.com/app/loginV3/ + https://phoenixviewer.com/app/loginV3/ loginuri https://login.agni.lindenlab.com/cgi-bin/login.cgi diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6329010e5a..db91792064 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -24246,7 +24246,7 @@ Change of this parameter will affect the layout of buttons in notification toast Type String Value - http://phoenixviewer.com/app/loginV3/secondlifegrid.xml + https://phoenixviewer.com/app/loginV3/secondlifegrid.xml FSIgnoreAdHocSessions diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp index aa5e69fa5b..462b10ca41 100644 --- a/indra/newview/fsgridhandler.cpp +++ b/indra/newview/fsgridhandler.cpp @@ -149,7 +149,7 @@ void gridDownloadComplete( LLSD const &aData, LLGridManager* mOwner, GridEntry* } } -const char* DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/loginV3/"; +const char* DEFAULT_LOGIN_PAGE = "https://phoenixviewer.com/app/loginV3/"; const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/"; const char* MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/"; diff --git a/indra/newview/fspanelradar.cpp b/indra/newview/fspanelradar.cpp index 8334d58e28..e6e0d7c5d5 100644 --- a/indra/newview/fspanelradar.cpp +++ b/indra/newview/fspanelradar.cpp @@ -389,7 +389,8 @@ void FSPanelRadar::updateList(const std::vector& entries, const LLSD& stat row_data["columns"][6]["column"] = "has_notes"; row_data["columns"][6]["type"] = "icon"; - row_data["columns"][6]["value"] = (entry["has_notes"].asBoolean() ? notesColumnIcon : ""); + row_data["columns"][6]["value"] = (entry["notes"].asBoolean() ? notesColumnIcon : ""); + row_data["columns"][6]["tool_tip"] = entry["notes"].asString(); row_data["columns"][7]["column"] = "age"; row_data["columns"][7]["value"] = entry["age"]; diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp index c50b04578c..4d495c6470 100644 --- a/indra/newview/fsradar.cpp +++ b/indra/newview/fsradar.cpp @@ -528,7 +528,7 @@ void FSRadar::updateRadarList() if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) { - entry["has_notes"] = ent->hasNotes(); + entry["notes"] = ent->getNotes(); entry["age"] = (avAge > -1 ? llformat("%d", avAge) : ""); if (ent->hasAlertAge()) { @@ -547,7 +547,7 @@ void FSRadar::updateRadarList() } else { - entry["has_notes"] = false; + entry["notes"] = LLStringUtil::null; entry["age"] = "---"; } diff --git a/indra/newview/fsradarentry.cpp b/indra/newview/fsradarentry.cpp index 2504b1c5c9..ef911faa58 100644 --- a/indra/newview/fsradarentry.cpp +++ b/indra/newview/fsradarentry.cpp @@ -48,7 +48,7 @@ FSRadarEntry::FSRadarEntry(const LLUUID& avid) mAge(-1), mIsLinden(false), mIgnore(false), - mHasNotes(false), + mNotes(LLStringUtil::null), mAlertAge(false), mAgeAlertPerformed(false), mAvatarNameCallbackConnection() @@ -124,9 +124,10 @@ void FSRadarEntry::processProperties(void* data, EAvatarProcessorType type) else if (type == APT_NOTES) { LLAvatarNotes* avatar_notes = static_cast(data); - if (avatar_notes && avatar_notes->agent_id == gAgentID && avatar_notes->target_id == mID) + if (avatar_notes && avatar_notes->agent_id == gAgentID && avatar_notes->target_id == mID && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) { - mHasNotes = !avatar_notes->notes.empty(); + mNotes = avatar_notes->notes; + LLStringUtil::trim(mNotes); } } } diff --git a/indra/newview/fsradarentry.h b/indra/newview/fsradarentry.h index c179f44b8d..30c1599378 100644 --- a/indra/newview/fsradarentry.h +++ b/indra/newview/fsradarentry.h @@ -41,9 +41,10 @@ public: ~FSRadarEntry(); LLUUID getId() const { return mID; } - std::string getName() const { return mName; } - std::string getUserName() const { return mUserName; } - std::string getDisplayName() const { return mDisplayName; } + const std::string& getName() const { return mName; } + const std::string& getUserName() const { return mUserName; } + const std::string& getDisplayName() const { return mDisplayName; } + const std::string& getNotes() const { return mNotes; } F32 getRange() const { return mRange; } LLVector3d getGlobalPos() const { return mGlobalPos; } LLUUID getRegion() const { return mRegion; } @@ -54,7 +55,6 @@ public: time_t getLastZOffsetTime() const { return mLastZOffsetTime; } bool getIsLinden() const { return mIsLinden; } bool getIgnore() const { return mIgnore; } - bool hasNotes() const { return mHasNotes; } bool hasAlertAge() const { return mAlertAge; } bool hasAgeAlertPerformed() const { return mAgeAlertPerformed; } @@ -72,6 +72,7 @@ private: std::string mName; std::string mUserName; std::string mDisplayName; + std::string mNotes; F32 mRange; LLVector3d mGlobalPos; LLUUID mRegion; @@ -82,7 +83,6 @@ private: time_t mLastZOffsetTime; bool mIsLinden; bool mIgnore; - bool mHasNotes; bool mAlertAge; bool mAgeAlertPerformed; diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index e9f1a469b1..990edf51d1 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -66,7 +66,8 @@ // [FS Communication UI] #include "llspeakers.h" #include "llnotificationsutil.h" -#include "llpaneltopinfobar.h" +// We don't use the mini location panel in Firestorm +// #include "llpaneltopinfobar.h" #include "llparcel.h" #include "llrendersphere.h" #include "llscriptruntimeperms.h" @@ -2618,10 +2619,12 @@ void LLAgent::endAnimationUpdateUI() LLNavigationBar::instance().getView()->setVisible(TRUE); gStatusBar->setVisibleForMouselook(true); - if (gSavedSettings.getBOOL("ShowMiniLocationPanel")) - { - LLPanelTopInfoBar::getInstance()->setVisible(TRUE); - } + // We don't use the mini location panel in Firestorm + // if (gSavedSettings.getBOOL("ShowMiniLocationPanel")) + // { + // LLPanelTopInfoBar::getInstance()->setVisible(TRUE); + // } + // LLChicletBar::getInstance()->setVisible(TRUE); @@ -2780,7 +2783,8 @@ void LLAgent::endAnimationUpdateUI() LLNavigationBar::instance().getView()->setVisible(FALSE); gStatusBar->setVisibleForMouselook(false); - LLPanelTopInfoBar::getInstance()->setVisible(FALSE); + // We don't use the mini location panel in Firestorm + // LLPanelTopInfoBar::getInstance()->setVisible(FALSE); LLChicletBar::getInstance()->setVisible(FALSE); diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 12b2deb431..db3d737b85 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4279,7 +4279,11 @@ void LLAppViewer::writeSystemInfo() gDebugInfo["FirstRunThisInstall"] = gSavedSettings.getBOOL("FirstRunThisInstall"); gDebugInfo["StartupState"] = LLStartUp::getStartupStateString(); - std::vector resolutions = gViewerWindow->getWindow()->getDisplaysResolutionList(); + // FIRE-31153, do not use gViewerWindow->getWindow which equals nullptr at this point + //std::vector resolutions = gViewerWindow->getWindow()->getDisplaysResolutionList(); + std::vector resolutions = LLWindow::getDisplaysResolutionList(); + // + for (auto res_iter : resolutions) { gDebugInfo["DisplayInfo"].append(res_iter); @@ -4985,7 +4989,7 @@ bool LLAppViewer::initCache() // // Fix integer overflow //const unsigned int disk_cache_bytes = disk_cache_mb * 1024 * 1024; - const uintmax_t disk_cache_bytes = disk_cache_mb * 1024 * 1024; + const uintmax_t disk_cache_bytes = disk_cache_mb * 1024ULL * 1024ULL; const bool enable_cache_debug_info = gSavedSettings.getBOOL("EnableDiskCacheDebugInfo"); bool texture_cache_mismatch = false; diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index 1d8952a268..b67ac859ee 100644 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -29,7 +29,8 @@ #include "llchiclet.h" #include "lllayoutstack.h" -#include "llpaneltopinfobar.h" +// We don't use the mini location panel in Firestorm +// #include "llpaneltopinfobar.h" #include "llsyswellwindow.h" #include "llfloaternotificationstabbed.h" @@ -325,6 +326,8 @@ S32 LLChicletBar::getChicletPanelShrinkHeadroom() const void LLChicletBar::fitWithTopInfoBar() { + // We don't use the mini location panel in Firestorm + #if 0 LLPanelTopInfoBar& top_info_bar = LLPanelTopInfoBar::instance(); LLRect rect = getRect(); @@ -351,6 +354,8 @@ void LLChicletBar::fitWithTopInfoBar() setRect(rect); LLPanel::reshape(width, rect.getHeight(), false); + #endif + // } // Option to hide IM/Group chat chiclets diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 64fae234b8..80d45d6fb3 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -581,8 +581,12 @@ void LLDrawPoolAvatar::renderShadow(S32 pass) } LLVOAvatar::AvatarOverallAppearance oa = avatarp->getOverallAppearance(); BOOL impostor = !LLPipeline::sImpostorRender && avatarp->isImpostor(); - if (oa == LLVOAvatar::AOA_INVISIBLE || - (impostor && oa == LLVOAvatar::AOA_JELLYDOLL)) + // plain old impostors are passing through the shadow pipeline + // if (oa == LLVOAvatar::AOA_INVISIBLE || + // (impostor && oa == LLVOAvatar::AOA_JELLYDOLL)) + // Note: Impostors should not cast shadows, also all JDs are impostor nowadays so we do not need the extra check at all. + if (impostor || (oa == LLVOAvatar::AOA_INVISIBLE) ) + // { // No shadows for jellydolled or invisible avs. return; diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 059253532e..143203d24d 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -5773,6 +5773,25 @@ BOOL FSPanelPreferenceBackup::postBuild() getChild("settings_backup_path")->setValue(dir_name); // + // + #if !defined OPENSIM + // Note: Windlight setting restore is enabled in OPENSIM bulds irrespective of grid (or pre-login) + // windlights settings folders are not grid specific and thus neither is the restore. + // if windlight folders existsed they will be backed up on all builds but for SL only builds they will not be restored. + + LLScrollListCtrl* globalFoldersScrollList = getChild("restore_global_folders_list"); + std::vector globalFoldersList = globalFoldersScrollList->getAllData(); + for (const auto item : globalFoldersList) + { + // if it is windlight related remove it. + if (item->getValue().asString().rfind("windlight",0) == 0) + { + LL_INFOS() << "removing windlight folder (no longer used in SL) : " << item->getValue().asString() << " index: " << globalFoldersScrollList->getItemIndex(item) << LL_ENDL; + globalFoldersScrollList->deleteSingleItem(globalFoldersScrollList->getItemIndex(item)); + } + } + #endif + // return LLPanelPreference::postBuild(); } diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 9357292eea..078d2e0ca0 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -42,7 +42,8 @@ #include "lllandmarkactions.h" #include "lllocationhistory.h" #include "lllocationinputctrl.h" -#include "llpaneltopinfobar.h" +// We don't use the mini location panel in Firestorm +// #include "llpaneltopinfobar.h" #include "llteleporthistory.h" #include "llresizebar.h" #include "llsearchcombobox.h" @@ -842,7 +843,8 @@ void LLNavigationBar::onNavigationButtonHeldUp(LLButton* nav_button) void LLNavigationBar::handleLoginComplete() { LLTeleportHistory::getInstance()->handleLoginComplete(); - LLPanelTopInfoBar::instance().handleLoginComplete(); + // We don't use the mini location panel in Firestorm + // LLPanelTopInfoBar::instance().handleLoginComplete(); gStatusBar->handleLoginComplete(); mCmbLocation->handleLoginComplete(); // Commented out because we don't have the LL viewer layout diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 2aef348685..2f0a78b1b2 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -970,7 +970,9 @@ void LLSpatialGroup::destroyGL(bool keep_occlusion) // Reset VB during TP if (is_tree_group && drawable->getVObj()) { - ((LLVOTree*)drawable->getVObj().get())->destroyVB(); + auto votree = dynamic_cast(drawable->getVObj().get()); + if (votree) + votree->destroyVB(); } // } diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 3422aaed33..ac5a06b53b 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -698,7 +698,14 @@ bool LLToolPie::walkToClickedLocation() } // [/RLVa:KB] - gAgentCamera.setFocusOnAvatar(TRUE, TRUE); + // FIRE-31135 Do not reset camera position for "click to walk" + // gAgentCamera.setFocusOnAvatar(TRUE, TRUE); + static LLCachedControl sResetCameraOnMovement(gSavedSettings, "FSResetCameraOnMovement"); + if (sResetCameraOnMovement) + { + gAgentCamera.setFocusOnAvatar(TRUE, TRUE); + } + // if (mAutoPilotDestination) { mAutoPilotDestination->markDead(); } mAutoPilotDestination = (LLHUDEffectBlob *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BLOB, FALSE); diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 634ce901d7..c5fe50f6c3 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -74,7 +74,8 @@ //#include "llpanellogin.h" #include "fspanellogin.h" // [FS Login Panel] -#include "llpaneltopinfobar.h" +// We don't use the mini location panel in Firestorm +// #include "llpaneltopinfobar.h" #include "llspellcheck.h" #include "llslurl.h" #include "llstartup.h" @@ -1067,7 +1068,7 @@ void handlePlayBentoIdleAnimationChanged(const LLSD& newValue) void handleDiskCacheSizeChanged(const LLSD& newValue) { const unsigned int disk_cache_mb = gSavedSettings.getU32("FSDiskCacheSize"); - const U64 disk_cache_bytes = disk_cache_mb * 1024 * 1024; + const U64 disk_cache_bytes = disk_cache_mb * 1024ULL * 1024ULL; LLDiskCache::getInstance()->setMaxSizeBytes(disk_cache_bytes); } // diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 3daf2621a5..8681cc89ee 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -62,7 +62,7 @@ const std::string GRID_LOGIN_IDENTIFIER_TYPES = "login_identifier_types"; const std::string GRID_SLURL_BASE = "slurl_base"; const std::string GRID_APP_SLURL_BASE = "app_slurl_base"; -const std::string DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/loginV3/"; +const std::string DEFAULT_LOGIN_PAGE = "https://phoenixviewer.com/app/loginV3/"; const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi"; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index ba1d38319b..b8792875c3 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -141,7 +141,8 @@ #include "llmoveview.h" #include "llnavigationbar.h" #include "llnotificationhandler.h" -#include "llpaneltopinfobar.h" +// We don't use the mini location panel in Firestorm +// #include "llpaneltopinfobar.h" #include "llpopupview.h" #include "llpreviewtexture.h" #include "llprogressview.h" @@ -7108,7 +7109,8 @@ void LLViewerWindow::setUIVisibility(bool visible) // Is done inside XUI now, using visibility_control //LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE); - LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : FALSE); + // We don't use the mini location panel in Firestorm + // LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : FALSE); mRootView->getChildView("status_bar_container")->setVisible(visible); // hide utility bar if we are on a skin that uses it, e.g. Vintage diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp index bed79ce4a1..a8290b4942 100644 --- a/indra/newview/rlvui.cpp +++ b/indra/newview/rlvui.cpp @@ -23,7 +23,8 @@ #include "llmoveview.h" // Movement panel (contains "Stand" and "Stop Flying" buttons) #include "llnavigationbar.h" // Navigation bar #include "llparcel.h" -#include "llpaneltopinfobar.h" +// We don't use the mini location panel in Firestorm +// #include "llpaneltopinfobar.h" #include "llteleporthistory.h" #include "llviewerparcelmgr.h" #include "llviewerregion.h" @@ -114,8 +115,10 @@ void RlvUIEnabler::onToggleShowLoc() if (LLNavigationBar::instanceExists()) LLNavigationBar::instance().refreshLocationCtrl(); - if (LLPanelTopInfoBar::instanceExists()) - LLPanelTopInfoBar::instance().update(); + // We don't use the mini location panel in Firestorm + // if (LLPanelTopInfoBar::instanceExists()) + // LLPanelTopInfoBar::instance().update(); + // We don't use the mini location panel in Firestorm if (!fEnable) { diff --git a/indra/newview/skins/default/xui/da/menu_favorites.xml b/indra/newview/skins/default/xui/da/menu_favorites.xml index a4793e294c..a21bd322fc 100644 --- a/indra/newview/skins/default/xui/da/menu_favorites.xml +++ b/indra/newview/skins/default/xui/da/menu_favorites.xml @@ -1,9 +1,9 @@ + - diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml index 13dbcdd42e..dca9369e82 100644 --- a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml @@ -1,8 +1,8 @@ - + diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml index 0b151b68af..1bd2f0b594 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml @@ -7,7 +7,6 @@ - diff --git a/indra/newview/skins/default/xui/de/menu_favorites.xml b/indra/newview/skins/default/xui/de/menu_favorites.xml index c5e662c945..6cccba3bd8 100644 --- a/indra/newview/skins/default/xui/de/menu_favorites.xml +++ b/indra/newview/skins/default/xui/de/menu_favorites.xml @@ -1,9 +1,9 @@ + - diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml index 58a34d0c68..58e643662a 100644 --- a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml @@ -1,11 +1,11 @@ + - diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml index 187d91fa32..1773e0ea3a 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml @@ -37,7 +37,6 @@ - - + - diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml index c92bd19787..5f2b0987f0 100644 --- a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml @@ -1,8 +1,8 @@ - + diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml index 9d3cbd68ad..4c6c76eb40 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml @@ -19,7 +19,6 @@ - diff --git a/indra/newview/skins/default/xui/fr/menu_favorites.xml b/indra/newview/skins/default/xui/fr/menu_favorites.xml index 5f1545fde7..48685f02c1 100644 --- a/indra/newview/skins/default/xui/fr/menu_favorites.xml +++ b/indra/newview/skins/default/xui/fr/menu_favorites.xml @@ -1,9 +1,9 @@ + - diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml index d0648f20e1..e510dda2c3 100644 --- a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml @@ -1,8 +1,8 @@ - + diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 2d1ee3e931..df1eefdfca 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -11,7 +11,27 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -40,7 +60,7 @@ - + @@ -97,6 +117,7 @@ + @@ -233,6 +254,7 @@ + diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml index 37850aad09..7343ac9bf4 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml @@ -17,6 +17,7 @@ + diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml index 61ce45eece..96d4614756 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml @@ -24,7 +24,6 @@