From 3ff0cd546ad8990a577b9f82cf3f73be85ed5555 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 22 Sep 2023 22:18:55 +0300 Subject: [PATCH 1/8] SL-20188 Size of friend list affects time to open Preferences floater Don't check every file when it's enough to know if there are any. --- indra/newview/llfloaterpreference.cpp | 4 +--- indra/newview/lllogchat.cpp | 21 +++++++++++++++++++++ indra/newview/lllogchat.h | 1 + 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 9ea49e935f..e48f989c52 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -471,9 +471,7 @@ BOOL LLFloaterPreference::postBuild() void LLFloaterPreference::updateDeleteTranscriptsButton() { - std::vector list_of_transcriptions_file_names; - LLLogChat::getListOfTranscriptFiles(list_of_transcriptions_file_names); - getChild("delete_transcripts")->setEnabled(list_of_transcriptions_file_names.size() > 0); + getChild("delete_transcripts")->setEnabled(LLLogChat::transcriptFilesExist()); } void LLFloaterPreference::onDoNotDisturbResponseChanged() diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index ba82ff0b0f..1592afc66c 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -651,6 +651,27 @@ std::string LLLogChat::oldLogFileName(std::string filename) return scanResult; } +bool LLLogChat::transcriptFilesExist() +{ + std::string pattern = "*." + LL_TRANSCRIPT_FILE_EXTENSION; + // get Users log directory + std::string dirname = gDirUtilp->getPerAccountChatLogsDir(); + + // add final OS dependent delimiter + dirname += gDirUtilp->getDirDelimiter(); + + LLDirIterator iter(dirname, pattern); + std::string filename; + while (iter.next(filename)) + { + std::string fullname = gDirUtilp->add(dirname, filename); + if (isTranscriptFileFound(fullname)) + { + return true; + } + } + return false; +} // static void LLLogChat::findTranscriptFiles(std::string pattern, std::vector& list_of_transcriptions) { diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index 5dce8ab1d2..9e2e060de2 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -103,6 +103,7 @@ public: const std::string& from, const LLUUID& from_id, const std::string& line); + static bool transcriptFilesExist(); static void findTranscriptFiles(std::string pattern, std::vector& list_of_transcriptions); static void getListOfTranscriptFiles(std::vector& list); static void getListOfTranscriptBackupFiles(std::vector& list_of_transcriptions); From 017d9d2affd12000666cd0c3f56d6ebfd8bfa9f9 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Mon, 25 Sep 2023 20:18:59 +0200 Subject: [PATCH 2/8] SL-20335 Disable ERROR # diffuseColor4fv : ASSERT (shader != NULL) --- indra/newview/lldrawpoolground.cpp | 6 +++--- indra/newview/llvosky.cpp | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/indra/newview/lldrawpoolground.cpp b/indra/newview/lldrawpoolground.cpp index 5b74264dab..77de386040 100644 --- a/indra/newview/lldrawpoolground.cpp +++ b/indra/newview/lldrawpoolground.cpp @@ -53,11 +53,11 @@ void LLDrawPoolGround::prerender() void LLDrawPoolGround::render(S32 pass) { - if (mDrawFace.empty() || !gSavedSettings.getBOOL("RenderGround")) + if (mDrawFace.empty() || !LLGLSLShader::sCurBoundShaderPtr || !gSavedSettings.getBOOL("RenderGround")) { return; - } - + } + LLGLSPipelineDepthTestSkyBox gls_skybox(true, false); gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 909588367b..cb2f8b6e18 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -767,7 +767,10 @@ bool LLVOSky::updateSky() mForceUpdate = FALSE; mForceUpdateThrottle.setTimerExpirySec(UPDATE_EXPRY); - gPipeline.markRebuild(gSky.mVOGroundp->mDrawable, LLDrawable::REBUILD_ALL, TRUE); + if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_GROUND)) + { + gPipeline.markRebuild(gSky.mVOGroundp->mDrawable, LLDrawable::REBUILD_ALL, TRUE); + } if (mDrawable.notNull() && mDrawable->getFace(0) && !mDrawable->getFace(0)->getVertexBuffer()) { From 7e2ff9d1e709f97e56f8fba17dd1a750da2f4a89 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Mon, 25 Sep 2023 23:57:54 +0300 Subject: [PATCH 3/8] SL-20276 shape thumbnails should display front of avatar regardless of 'AppearanceCameraMovement' setting --- indra/newview/lltoolmorph.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp index d99c0ba2a6..e937c499ae 100644 --- a/indra/newview/lltoolmorph.cpp +++ b/indra/newview/lltoolmorph.cpp @@ -223,6 +223,13 @@ BOOL LLVisualParamHint::render() LLVector3 target_pos = target_joint_pos + (target_offset * avatar_rotation); F32 cam_angle_radians = mVisualParam->getCameraAngle() * DEG_TO_RAD; + + static LLCachedControl auto_camera_position(gSavedSettings, "AppearanceCameraMovement"); + if (!auto_camera_position) + { + cam_angle_radians += F_PI; + } + LLVector3 camera_snapshot_offset( mVisualParam->getCameraDistance() * cosf( cam_angle_radians ), mVisualParam->getCameraDistance() * sinf( cam_angle_radians ), From d0d05ddddfe6736b50e589a20d4d6ea457ad9b32 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 22 Sep 2023 23:38:20 +0300 Subject: [PATCH 4/8] SL-15039 Prune unused preferences #4 --- indra/llui/llfolderview.cpp | 6 +- indra/newview/app_settings/settings.xml | 374 ------------------ indra/newview/llchannelmanager.cpp | 5 +- indra/newview/llcompilequeue.cpp | 13 +- indra/newview/llfloatersearch.cpp | 6 - indra/newview/llfloaterworldmap.cpp | 12 - indra/newview/llgroupactions.cpp | 6 - indra/newview/llimhandler.cpp | 5 +- indra/newview/llinspect.cpp | 6 +- indra/newview/llinventorybridge.cpp | 9 +- indra/newview/llnotificationgrouphandler.cpp | 5 +- indra/newview/llnotificationofferhandler.cpp | 3 +- indra/newview/llnotificationscripthandler.cpp | 5 +- indra/newview/llnotificationtiphandler.cpp | 5 +- indra/newview/llpanelprofilepicks.cpp | 6 - indra/newview/llscreenchannel.h | 2 + indra/newview/llvieweraudio.cpp | 6 +- indra/newview/llviewerdisplay.cpp | 6 +- indra/newview/llviewermessage.cpp | 3 +- indra/newview/llviewertexturelist.cpp | 9 +- indra/newview/llvoicecallhandler.cpp | 6 - 21 files changed, 38 insertions(+), 460 deletions(-) diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 62c311f522..ed49c0dcfd 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -333,9 +333,9 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height ) void LLFolderView::filter( LLFolderViewFilter& filter ) { LL_PROFILE_ZONE_SCOPED_CATEGORY_UI; - static LLCachedControl time_visible(*LLUI::getInstance()->mSettingGroups["config"], "FilterItemsMaxTimePerFrameVisible", 10); - static LLCachedControl time_invisible(*LLUI::getInstance()->mSettingGroups["config"], "FilterItemsMaxTimePerFrameUnvisible", 1); - filter.resetTime(llclamp((mParentPanel.get()->getVisible() ? time_visible() : time_invisible()), 1, 100)); + const S32 TIME_VISIBLE = 10; // in milliseconds + const S32 TIME_INVISIBLE = 1; + filter.resetTime(llclamp((mParentPanel.get()->getVisible() ? TIME_VISIBLE : TIME_INVISIBLE), 1, 100)); // Note: we filter the model, not the view getViewModelItem()->filter(filter); diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 654ab76b30..e11b44717d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2491,17 +2491,6 @@ Value 1 - EnableIMChatPopups - - Comment - Enable Incoming IM Chat Popups - Persist - 1 - Type - Boolean - Value - 1 - DisplayTimecode Comment @@ -2623,17 +2612,6 @@ Value 6 - EffectScriptChatParticles - - Comment - 1 = normal behavior, 0 = disable display of swirling lights when scripts communicate - Persist - 1 - Type - Boolean - Value - 1 - EnableGrab Comment @@ -2711,39 +2689,6 @@ Value 1 - EnergyFromTop - - Comment - - Persist - 0 - Type - S32 - Value - 20 - - EnergyHeight - - Comment - - Persist - 0 - Type - S32 - Value - 40 - - EnergyWidth - - Comment - - Persist - 0 - Type - S32 - Value - 175 - EventURL Comment @@ -2755,61 +2700,6 @@ Value http://events.[GRID]/viewer/embed/event/[EVENT_ID] - FastCacheFetchEnabled - - Comment - Enable texture fast cache fetching if set - Persist - 1 - Type - Boolean - Value - 1 - - FeatureManagerHTTPTable - - Comment - Deprecated - Persist - 0 - Type - String - Value - - - FPSLogFrequency - - Comment - Seconds between display of FPS in log (0 for never) - Persist - 1 - Type - F32 - Value - 10.0 - - FilterItemsMaxTimePerFrameVisible - - Comment - Max time devoted to items filtering per frame for visible inventory listings (in milliseconds) - Persist - 1 - Type - S32 - Value - 10 - - FilterItemsMaxTimePerFrameUnvisible - - Comment - Max time devoted to items filtering per frame for non visible inventory listings (in milliseconds) - Persist - 1 - Type - S32 - Value - 1 - MainWorkTime Comment @@ -2821,72 +2711,6 @@ Value 0.1 - QueueInventoryFetchTimeout - - Comment - Max time llcompilequeue will wait for inventory fetch to complete (in seconds) - Persist - 1 - Type - F32 - Value - 300.0 - - FindLandArea - - Comment - Enables filtering of land search results by area - Persist - 1 - Type - Boolean - Value - 0 - - FindLandPrice - - Comment - Enables filtering of land search results by price - Persist - 1 - Type - Boolean - Value - 1 - - FindLandType - - Comment - Controls which type of land you are searching for in Find Land interface ("All", "Auction", "For Sale") - Persist - 1 - Type - String - Value - All - - FindPeopleOnline - - Comment - Limits people search to only users who are logged on - Persist - 1 - Type - Boolean - Value - 1 - - FindPlacesPictures - - Comment - Display only results of find places that have pictures - Persist - 1 - Type - Boolean - Value - 1 - FirstName Comment @@ -3402,17 +3226,6 @@ Value 0.75 - FolderLoadingMessageWaitTime - - Comment - Seconds to wait before showing the LOADING... text in folder views - Persist - 1 - Type - F32 - Value - 0.5 - FontScreenDPI Comment @@ -3600,28 +3413,6 @@ Value 32 - GroupNotifyBoxHeight - - Comment - Height of group notice messages - Persist - 1 - Type - S32 - Value - 260 - - GroupNotifyBoxWidth - - Comment - Width of group notice messages - Persist - 1 - Type - S32 - Value - 305 - HelpURLFormat Comment @@ -3710,17 +3501,6 @@ Value - HtmlHelpLastPage - - Comment - Last URL visited via help system - Persist - 1 - Type - String - Value - - HttpPipelining Comment @@ -3743,17 +3523,6 @@ Value 0 - IMShowTimestamps - - Comment - Show timestamps in IM - Persist - 1 - Type - Boolean - Value - 1 - IMShowControlPanel Comment @@ -3764,17 +3533,6 @@ Boolean Value 1 - - IMShowContentPanel - - Comment - Show Toolbar and Body Panels - Persist - 1 - Type - Boolean - Value - 1 IgnoreFOVZoomForLODs @@ -3841,28 +3599,6 @@ F32 Value 0.0 - - InspectorFadeTime - - Comment - Fade out timing for inspectors - Persist - 1 - Type - F32 - Value - 0.5 - - InspectorShowTime - - Comment - Stay timing for inspectors - Persist - 1 - Type - F32 - Value - 3.0 InstallLanguage @@ -4282,17 +4018,6 @@ Value 2.0 - LCDDestination - - Comment - Which LCD to use - Persist - 1 - Type - S32 - Value - 0 - LeapCommand Comment @@ -6060,28 +5785,6 @@ Value 0 - NotifyBoxHeight - - Comment - Height of notification messages - Persist - 1 - Type - S32 - Value - 200 - - NotifyBoxWidth - - Comment - Width of notification messages - Persist - 1 - Type - S32 - Value - 305 - NotificationConferenceIMOptions Comment @@ -13869,17 +13572,6 @@ Value -1.0 - ForcePeriodicRenderingTime - - Comment - Periodically enable all rendering masks for a single frame. - Persist - 1 - Type - F32 - Value - -1.0 - ZoomDirect Comment @@ -14348,17 +14040,6 @@ Value 1 - EnableGroupInfo - - Comment - Enable viewing and editing of group info from web link - Persist - 1 - Type - Boolean - Value - 1 - EnablePlaceProfile Comment @@ -14370,28 +14051,6 @@ Value 1 - EnablePicks - - Comment - Enable editing of picks from web link - Persist - 1 - Type - Boolean - Value - 1 - - EnableWorldMap - - Comment - Enable opening world map from web link - Persist - 1 - Type - Boolean - Value - 1 - EnableAvatarPay Comment @@ -14403,17 +14062,6 @@ Value 1 - EnableVoiceCall - - Comment - Enable voice calls from web link - Persist - 1 - Type - Boolean - Value - 1 - EnableAvatarShare Comment @@ -14436,17 +14084,6 @@ Value 1 - EnableSearch - - Comment - Enable opening search from web link - Persist - 1 - Type - Boolean - Value - 1 - EnableAppearance Comment @@ -15327,17 +14964,6 @@ Value 1000 - FMODExStreamBufferSize - - Comment - Sets the streaming buffer size (in milliseconds) for FMOD Ex or FMOD Studio - Persist - 1 - Type - U32 - Value - 7000 - VersionChannelName Comment diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index 928508e13a..934b852a41 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -143,9 +143,8 @@ void LLChannelManager::onLoginCompleted() gViewerWindow->getRootView()->addChild(mStartUpChannel); // init channel's position and size - S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); - S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); - mStartUpChannel->init(channel_right_bound - channel_width, channel_right_bound); + S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); + mStartUpChannel->init(channel_right_bound - NOTIFY_BOX_WIDTH, channel_right_bound); mStartUpChannel->setMouseDownCallback(boost::bind(&LLFloaterNotificationsTabbed::onStartUpToastClick, LLFloaterNotificationsTabbed::getInstance(), _2, _3, _4)); mStartUpChannel->setCommitCallback(boost::bind(&LLChannelManager::onStartUpToastClose, this)); diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp index 9031ea5b1b..6826ba06db 100644 --- a/indra/newview/llcompilequeue.cpp +++ b/indra/newview/llcompilequeue.cpp @@ -66,6 +66,7 @@ namespace { const std::string QUEUE_EVENTPUMP_NAME("ScriptActionQueue"); + const F32 QUEUE_INVENTORY_FETCH_TIMEOUT = 300.f; // ObjectIventoryFetcher is an adapter between the LLVOInventoryListener::inventoryChanged // callback mechanism and the LLEventPump coroutine architecture allowing the @@ -359,8 +360,6 @@ bool LLFloaterCompileQueue::processScript(LLHandle hfloat // Dereferencing floater may fail. If they do they throw LLExeceptionStaleHandle. // which is caught in objectScriptProcessingQueueCoro bool monocompile = floater->mMono; - F32 fetch_timeout = gSavedSettings.getF32("QueueInventoryFetchTimeout"); - // Initial test to see if we can (or should) attempt to compile the script. LLInventoryItem *item = dynamic_cast(inventory); @@ -385,7 +384,7 @@ bool LLFloaterCompileQueue::processScript(LLHandle hfloat LLExperienceCache::instance().fetchAssociatedExperience(inventory->getParentUUID(), inventory->getUUID(), boost::bind(&LLFloaterCompileQueue::handleHTTPResponse, pump.getName(), _1)); - result = llcoro::suspendUntilEventOnWithTimeout(pump, fetch_timeout, + result = llcoro::suspendUntilEventOnWithTimeout(pump, QUEUE_INVENTORY_FETCH_TIMEOUT, LLSDMap("timeout", LLSD::Boolean(true))); floater.check(); @@ -435,7 +434,7 @@ bool LLFloaterCompileQueue::processScript(LLHandle hfloat &LLFloaterCompileQueue::handleScriptRetrieval, &userData); - result = llcoro::suspendUntilEventOnWithTimeout(pump, fetch_timeout, + result = llcoro::suspendUntilEventOnWithTimeout(pump, QUEUE_INVENTORY_FETCH_TIMEOUT, LLSDMap("timeout", LLSD::Boolean(true))); } @@ -481,7 +480,7 @@ bool LLFloaterCompileQueue::processScript(LLHandle hfloat LLViewerAssetUpload::EnqueueInventoryUpload(url, uploadInfo); } - result = llcoro::suspendUntilEventOnWithTimeout(pump, fetch_timeout, LLSDMap("timeout", LLSD::Boolean(true))); + result = llcoro::suspendUntilEventOnWithTimeout(pump, QUEUE_INVENTORY_FETCH_TIMEOUT, LLSDMap("timeout", LLSD::Boolean(true))); floater.check(); @@ -736,8 +735,6 @@ void LLFloaterScriptQueue::objectScriptProcessingQueueCoro(std::string action, L // Dereferencing floater may fail. If they do they throw LLExeceptionStaleHandle. // This is expected if the dialog closes. LLEventMailDrop maildrop(QUEUE_EVENTPUMP_NAME, true); - F32 fetch_timeout = gSavedSettings.getF32("QueueInventoryFetchTimeout"); - try { @@ -759,7 +756,7 @@ void LLFloaterScriptQueue::objectScriptProcessingQueueCoro(std::string action, L args["[OBJECT_NAME]"] = (*itObj).mObjectName; floater->addStringMessage(floater->getString("LoadingObjInv", args)); - LLSD result = llcoro::suspendUntilEventOnWithTimeout(maildrop, fetch_timeout, + LLSD result = llcoro::suspendUntilEventOnWithTimeout(maildrop, QUEUE_INVENTORY_FETCH_TIMEOUT, LLSDMap("timeout", LLSD::Boolean(true))); if (result.has("timeout")) diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index 37ae80fa8f..a6ab61cbb9 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -48,12 +48,6 @@ public: LLSearchHandler() : LLCommandHandler("search", UNTRUSTED_CLICK_ONLY) { } bool handle(const LLSD& tokens, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web) { - if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableSearch")) - { - LLNotificationsUtil::add("NoSearch", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); - return true; - } - const size_t parts = tokens.size(); // get the (optional) category for the search diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 8f3ec8af05..42031bb0c5 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -129,12 +129,6 @@ public: const std::string& grid, LLMediaCtrl* web) { - if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableWorldMap")) - { - LLNotificationsUtil::add("NoWorldMap", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); - return true; - } - if (params.size() == 0) { // support the secondlife:///app/worldmap SLapp @@ -170,12 +164,6 @@ public: const std::string& grid, LLMediaCtrl* web) { - if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableWorldMap")) - { - LLNotificationsUtil::add("NoWorldMap", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); - return true; - } - //Make sure we have some parameters if (params.size() == 0) { diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 043316ccca..b588d6eaa1 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -88,12 +88,6 @@ public: return true; } - if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableGroupInfo")) - { - LLNotificationsUtil::add("NoGroupInfo", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); - return true; - } - if (tokens.size() < 1) { return false; diff --git a/indra/newview/llimhandler.cpp b/indra/newview/llimhandler.cpp index 0fa3dc1110..99be4dc92b 100644 --- a/indra/newview/llimhandler.cpp +++ b/indra/newview/llimhandler.cpp @@ -54,9 +54,8 @@ LLIMHandler::~LLIMHandler() //-------------------------------------------------------------------------- void LLIMHandler::initChannel() { - S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); - S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); - mChannel.get()->init(channel_right_bound - channel_width, channel_right_bound); + S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); + mChannel.get()->init(channel_right_bound - NOTIFY_BOX_WIDTH, channel_right_bound); } //-------------------------------------------------------------------------- diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp index f382b5985f..0da0609ff7 100644 --- a/indra/newview/llinspect.cpp +++ b/indra/newview/llinspect.cpp @@ -45,8 +45,8 @@ LLInspect::~LLInspect() // virtual void LLInspect::draw() { - static LLCachedControl FADE_TIME(*LLUI::getInstance()->mSettingGroups["config"], "InspectorFadeTime", 1.f); - static LLCachedControl STAY_TIME(*LLUI::getInstance()->mSettingGroups["config"], "InspectorShowTime", 1.f); + const F32 FADE_TIME = 0.5f; + const F32 STAY_TIME = 3.f; if (mOpenTimer.getStarted()) { LLFloater::draw(); @@ -59,7 +59,7 @@ void LLInspect::draw() } else if (mCloseTimer.getStarted()) { - F32 alpha = clamp_rescale(mCloseTimer.getElapsedTimeF32(), 0.f, FADE_TIME(), 1.f, 0.f); + F32 alpha = clamp_rescale(mCloseTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 1.f, 0.f); LLViewDrawContext context(alpha); LLFloater::draw(); if (mCloseTimer.getElapsedTimeF32() > FADE_TIME) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index db347f7096..cb009ef1ee 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -94,6 +94,7 @@ typedef std::pair two_uuids_t; typedef std::list two_uuids_list_t; const F32 SOUND_GAIN = 1.0f; +const F32 FOLDER_LOADING_MESSAGE_DELAY = 0.5f; // Seconds to wait before showing the LOADING... text in folder views struct LLMoveInv { @@ -2243,9 +2244,7 @@ void LLFolderBridge::buildDisplayName() const std::string LLFolderBridge::getLabelSuffix() const { - static LLCachedControl folder_loading_message_delay(gSavedSettings, "FolderLoadingMessageWaitTime", 0.5f); - - if (mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= folder_loading_message_delay()) + if (mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= FOLDER_LOADING_MESSAGE_DELAY) { return llformat(" ( %s ) ", LLTrans::getString("LoadingData").c_str()); } @@ -4686,9 +4685,7 @@ LLUIImagePtr LLMarketplaceFolderBridge::getMarketplaceFolderIcon(BOOL is_open) c std::string LLMarketplaceFolderBridge::getLabelSuffix() const { - static LLCachedControl folder_loading_message_delay(gSavedSettings, "FolderLoadingMessageWaitTime", 0.5f); - - if (mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= folder_loading_message_delay()) + if (mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= FOLDER_LOADING_MESSAGE_DELAY) { return llformat(" ( %s ) ", LLTrans::getString("LoadingData").c_str()); } diff --git a/indra/newview/llnotificationgrouphandler.cpp b/indra/newview/llnotificationgrouphandler.cpp index f87ebf219b..3c3d96f72c 100644 --- a/indra/newview/llnotificationgrouphandler.cpp +++ b/indra/newview/llnotificationgrouphandler.cpp @@ -56,9 +56,8 @@ LLGroupHandler::~LLGroupHandler() //-------------------------------------------------------------------------- void LLGroupHandler::initChannel() { - S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); - S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); - mChannel.get()->init(channel_right_bound - channel_width, channel_right_bound); + S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); + mChannel.get()->init(channel_right_bound - NOTIFY_BOX_WIDTH, channel_right_bound); } //-------------------------------------------------------------------------- diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index 3f22467544..0e7222838d 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -63,8 +63,7 @@ LLOfferHandler::~LLOfferHandler() void LLOfferHandler::initChannel() { S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); - S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); - mChannel.get()->init(channel_right_bound - channel_width, channel_right_bound); + mChannel.get()->init(channel_right_bound - NOTIFY_BOX_WIDTH, channel_right_bound); } //-------------------------------------------------------------------------- diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp index bb39d8f362..2f7dfa8e77 100644 --- a/indra/newview/llnotificationscripthandler.cpp +++ b/indra/newview/llnotificationscripthandler.cpp @@ -61,9 +61,8 @@ LLScriptHandler::~LLScriptHandler() //-------------------------------------------------------------------------- void LLScriptHandler::initChannel() { - S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); - S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); - mChannel.get()->init(channel_right_bound - channel_width, channel_right_bound); + S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); + mChannel.get()->init(channel_right_bound - NOTIFY_BOX_WIDTH, channel_right_bound); } //-------------------------------------------------------------------------- diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index 91f93067de..dc24e651cb 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -60,9 +60,8 @@ LLTipHandler::~LLTipHandler() //-------------------------------------------------------------------------- void LLTipHandler::initChannel() { - S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); - S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); - mChannel.get()->init(channel_right_bound - channel_width, channel_right_bound); + S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); + mChannel.get()->init(channel_right_bound - NOTIFY_BOX_WIDTH, channel_right_bound); } //-------------------------------------------------------------------------- diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp index 0535036cb0..fa42199089 100644 --- a/indra/newview/llpanelprofilepicks.cpp +++ b/indra/newview/llpanelprofilepicks.cpp @@ -97,12 +97,6 @@ public: return true; } - if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnablePicks")) - { - LLNotificationsUtil::add("NoPicks", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); - return true; - } - // handle app/pick/create urls first if (params.size() == 1 && params[0].asString() == "create") { diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h index d881952419..d66c8afc22 100644 --- a/indra/newview/llscreenchannel.h +++ b/indra/newview/llscreenchannel.h @@ -39,6 +39,8 @@ namespace LLNotificationsUI const LLUUID NEARBY_CHAT_CHANNEL_UUID("E1158BD6-661C-4981-9DAD-4DCBFF062502"); const LLUUID STARTUP_CHANNEL_UUID("B56AF90D-6684-48E4-B1E4-722D3DEB2CB6"); + const S32 NOTIFY_BOX_WIDTH = 305; + typedef enum e_notification_toast_alignment { NA_TOP, diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index 134fe0885e..48499f0da8 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -48,6 +48,8 @@ #include "llstreamingaudio.h" ///////////////////////////////////////////////////////// +const U32 FMODEX_DECODE_BUFFER_SIZE = 1000; // in milliseconds +const U32 FMODEX_STREAM_BUFFER_SIZE = 7000; // in milliseconds LLViewerAudio::LLViewerAudio() : mDone(true), @@ -116,7 +118,7 @@ void LLViewerAudio::startInternetStreamWithAutoFade(const std::string &streamURI LLStreamingAudioInterface *stream = gAudiop->getStreamingAudioImpl(); if (stream && stream->supportsAdjustableBufferSizes()) - stream->setBufferSizes(gSavedSettings.getU32("FMODExStreamBufferSize"), gSavedSettings.getU32("FMODExDecodeBufferSize")); + stream->setBufferSizes(FMODEX_STREAM_BUFFER_SIZE, FMODEX_DECODE_BUFFER_SIZE); gAudiop->startInternetStream(mNextStreamURI); } @@ -183,7 +185,7 @@ bool LLViewerAudio::onIdleUpdate() LL_DEBUGS("AudioEngine") << "Audio fade in: " << mNextStreamURI << LL_ENDL; LLStreamingAudioInterface *stream = gAudiop->getStreamingAudioImpl(); if(stream && stream->supportsAdjustableBufferSizes()) - stream->setBufferSizes(gSavedSettings.getU32("FMODExStreamBufferSize"),gSavedSettings.getU32("FMODExDecodeBufferSize")); + stream->setBufferSizes(FMODEX_STREAM_BUFFER_SIZE, FMODEX_DECODE_BUFFER_SIZE); gAudiop->startInternetStream(mNextStreamURI); } diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 206304dbf5..09b3dd5dc1 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -209,11 +209,11 @@ void display_update_camera() void display_stats() { LL_PROFILE_ZONE_SCOPED - F32 fps_log_freq = gSavedSettings.getF32("FPSLogFrequency"); - if (fps_log_freq > 0.f && gRecentFPSTime.getElapsedTimeF32() >= fps_log_freq) + const F32 FPS_LOG_FREQUENCY = 10.f; + if (gRecentFPSTime.getElapsedTimeF32() >= FPS_LOG_FREQUENCY) { LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("DS - FPS"); - F32 fps = gRecentFrameCount / fps_log_freq; + F32 fps = gRecentFrameCount / FPS_LOG_FREQUENCY; LL_INFOS() << llformat("FPS: %.02f", fps) << LL_ENDL; gRecentFrameCount = 0; gRecentFPSTime.reset(); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index df5e3021b1..6d76277404 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2531,8 +2531,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) // Make swirly things only for talking objects. (not script debug messages, though) if (chat.mSourceType == CHAT_SOURCE_OBJECT - && chat.mChatType != CHAT_TYPE_DEBUG_MSG - && gSavedSettings.getBOOL("EffectScriptChatParticles") ) + && chat.mChatType != CHAT_TYPE_DEBUG_MSG ) { LLPointer psc = new LLViewerPartSourceChat(chatter->getPositionAgent()); psc->setSourceObject(chatter); diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index e6d4b0d026..c6954f274a 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -588,7 +588,6 @@ LLViewerFetchedTexture* LLViewerTextureList::createImage(const LLUUID &image_id, LLHost request_from_host) { LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; - static LLCachedControl fast_cache_fetching_enabled(gSavedSettings, "FastCacheFetchEnabled", true); LLPointer imagep ; switch(texture_type) @@ -633,11 +632,9 @@ LLViewerFetchedTexture* LLViewerTextureList::createImage(const LLUUID &image_id, imagep->forceActive() ; } - if(fast_cache_fetching_enabled) - { - mFastCacheList.insert(imagep); - imagep->setInFastCacheList(true); - } + mFastCacheList.insert(imagep); + imagep->setInFastCacheList(true); + return imagep ; } diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp index 95e11abd82..c245399622 100644 --- a/indra/newview/llvoicecallhandler.cpp +++ b/indra/newview/llvoicecallhandler.cpp @@ -40,12 +40,6 @@ public: bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web) { - if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableVoiceCall")) - { - LLNotificationsUtil::add("NoVoiceCall", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); - return true; - } - //Make sure we have some parameters if (params.size() == 0) { From 3a1ae84c26cb12b9089a061cf59c7966d6c6e3f4 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 26 Sep 2023 22:15:03 +0300 Subject: [PATCH 5/8] SL-15039 Restored couple settings that are still in use by TPVs --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ indra/newview/llimprocessing.cpp | 25 ++++++++++++++++++++----- indra/newview/llviewermessage.cpp | 3 ++- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e11b44717d..a19d673bb8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -379,6 +379,17 @@ Value 0 + AutoAcceptNewInventory + + Comment + Automatically accept new notecards/textures/landmarks + Persist + 1 + Type + Boolean + Value + 0 + AutoLeveling Comment @@ -2612,6 +2623,17 @@ Value 6 + EffectScriptChatParticles + + Comment + 1 = normal behavior, 0 = disable display of swirling lights when scripts communicate + Persist + 1 + Type + Boolean + Value + 1 + EnableGrab Comment diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index a1a82fef7b..948793681d 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -189,6 +189,18 @@ void inventory_offer_handler(LLOfferInfo* info) return; } + bool bAutoAccept(false); + // Avoid the Accept/Discard dialog if the user so desires. JC + if (gSavedSettings.getBOOL("AutoAcceptNewInventory") + && (info->mType == LLAssetType::AT_NOTECARD + || info->mType == LLAssetType::AT_LANDMARK + || info->mType == LLAssetType::AT_TEXTURE)) + { + // For certain types, just accept the items into the inventory, + // and possibly open them on receipt depending upon "ShowNewInventory". + bAutoAccept = true; + } + // Strip any SLURL from the message display. (DEV-2754) std::string msg = info->mDesc; int indx = msg.find(" ( http://slurl.com/secondlife/"); @@ -254,7 +266,7 @@ void inventory_offer_handler(LLOfferInfo* info) LLNotification::Params p; // Object -> Agent Inventory Offer - if (info->mFromObject) + if (info->mFromObject && !bAutoAccept) { // Inventory Slurls don't currently work for non agent transfers, so only display the object name. args["ITEM_SLURL"] = msg; @@ -300,10 +312,13 @@ void inventory_offer_handler(LLOfferInfo* info) send_do_not_disturb_message(gMessageSystem, info->mFromID); } - // Inform user that there is a script floater via toast system - payload["give_inventory_notification"] = TRUE; - p.payload = payload; - LLPostponedNotification::add(p, info->mFromID, false); + if (!bAutoAccept) // if we auto accept, do not pester the user + { + // Inform user that there is a script floater via toast system + payload["give_inventory_notification"] = TRUE; + p.payload = payload; + LLPostponedNotification::add(p, info->mFromID, false); + } } LLFirstUse::newInventory(); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6d76277404..df5e3021b1 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2531,7 +2531,8 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) // Make swirly things only for talking objects. (not script debug messages, though) if (chat.mSourceType == CHAT_SOURCE_OBJECT - && chat.mChatType != CHAT_TYPE_DEBUG_MSG ) + && chat.mChatType != CHAT_TYPE_DEBUG_MSG + && gSavedSettings.getBOOL("EffectScriptChatParticles") ) { LLPointer psc = new LLViewerPartSourceChat(chatter->getPositionAgent()); psc->setSourceObject(chatter); From c49616eb6a6f3231041d90923a2bf2564d46b294 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 26 Sep 2023 22:49:11 +0300 Subject: [PATCH 6/8] SL-15039 Prune unused preferences #5 --- indra/newview/app_settings/settings.xml | 627 ------------------------ 1 file changed, 627 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a19d673bb8..62dfc516f2 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -698,17 +698,6 @@ Value 0 - BrowserProxyExclusions - - Comment - [NOT USED] - Persist - 1 - Type - String - Value - - BrowserProxyPort Comment @@ -720,17 +709,6 @@ Value 3128 - BrowserProxySocks45 - - Comment - [NOT USED] - Persist - 1 - Type - S32 - Value - 5 - Socks5ProxyEnabled Comment @@ -1245,51 +1223,6 @@ 0.75 - CameraOffsetFrontView - - Comment - Initial camera offset from avatar in Front View - Persist - 1 - Type - Vector3 - Value - - 2.2 - 0.0 - 0.0 - - - CameraOffsetGroupView - - Comment - Initial camera offset from avatar in Group View - Persist - 1 - Type - Vector3 - Value - - -1.0 - 0.7 - 0.5 - - - CameraOffsetCustomPreset - - Comment - Initial camera offset from avatar for the custom camera preset - Persist - 1 - Type - Vector3 - Value - - -3.0 - 0.0 - 0.75 - - CameraOffsetScale Comment @@ -1488,17 +1421,6 @@ Value 1 - ChatHistoryTornOff - - Comment - Show chat history window separately from Communicate window. - Persist - 1 - Type - Boolean - Value - 0 - ChatLoadGroupMaxMembers Comment @@ -1765,17 +1687,6 @@ Value 1 - ChatBarCustomWidth - - Comment - Stores customized width of chat bar. - Persist - 1 - Type - S32 - Value - 0 - CoroutineStackSize Comment @@ -2601,17 +2512,6 @@ Value 0 - IncludeEnhancedSkeleton - - Comment - Include extended skeleton joints when rendering skinned meshes. - Persist - 1 - Type - Boolean - Value - 1 - MinObjectsForUnlinkConfirm Comment @@ -3124,17 +3024,6 @@ Value 16.0 - FlycamZoomDirect - - Comment - Map flycam zoom axis directly to camera zoom. - Persist - 1 - Type - Boolean - Value - 0 - FlyingAtExit Comment @@ -3161,51 +3050,6 @@ 1.0 - FocusOffsetFrontView - - Comment - Initial focus point offset relative to avatar for the camera preset Front View - Persist - 1 - Type - Vector3D - Value - - 0.0 - 0.0 - 0.0 - - - FocusOffsetGroupView - - Comment - Initial focus point offset relative to avatar for the camera preset Group View - Persist - 1 - Type - Vector3D - Value - - 1.5 - 0.7 - 1.0 - - - FocusOffsetCustomPreset - - Comment - Initial focus point offset relative to avatar for the custom camera preset (x-axis is forward) - Persist - 1 - Type - Vector3D - Value - - 1.0 - 0.0 - 1.0 - - AvatarSitRotation Comment @@ -3303,17 +3147,6 @@ Value 0 - ForceMandatoryUpdate - - Comment - For QA: On next startup, forces the auto-updater to run - Persist - 1 - Type - Boolean - Value - 0 - FreezeTime Comment @@ -3699,17 +3532,6 @@ Value 1 - InventoryOutboxDisplayBoth - - Comment - (Deprecated) Show the legacy Merchant Outbox UI as well as the Marketplace Listings UI - Persist - 1 - Type - Boolean - Value - 0 - InventoryOutboxLogging Comment @@ -4172,17 +3994,6 @@ Value 0 - LastFindPanel - - Comment - Controls which find operation appears by default when clicking "Find" button - Persist - 1 - Type - String - Value - find_all_panel - LastName Comment @@ -4239,105 +4050,6 @@ 0.0.0 - LastSnapshotToProfileHeight - - Comment - The height of the last profile snapshot, in px - Persist - 1 - Type - S32 - Value - 768 - - LastSnapshotToEmailHeight - - Comment - The height of the last email snapshot, in px - Persist - 1 - Type - S32 - Value - 768 - - LastSnapshotToProfileWidth - - Comment - The width of the last profile snapshot, in px - Persist - 1 - Type - S32 - Value - 1024 - - LastSnapshotToEmailWidth - - Comment - The width of the last email snapshot, in px - Persist - 1 - Type - S32 - Value - 1024 - - LastSnapshotToDiskHeight - - Comment - The height of the last disk snapshot, in px - Persist - 1 - Type - S32 - Value - 768 - - LastSnapshotToDiskWidth - - Comment - The width of the last disk snapshot, in px - Persist - 1 - Type - S32 - Value - 1024 - - LastSnapshotToInventoryHeight - - Comment - The height of the last texture snapshot, in px - Persist - 1 - Type - S32 - Value - 512 - - LastSnapshotToInventoryWidth - - Comment - The width of the last texture snapshot, in px - Persist - 1 - Type - S32 - Value - 512 - - LeftClickShowMenu - - Comment - Unused obsolete setting - Persist - 1 - Type - Boolean - Value - 0 - LimitDragDistance Comment @@ -4504,17 +4216,6 @@ Value 40.0 - LoginSRVPump - - Comment - (Deprecated) Name of the message pump that handles SRV request) - Persist - 0 - Type - String - Value - LLAres - LogMessages Comment @@ -4603,17 +4304,6 @@ Value 60.0 - MapOverlayIndex - - Comment - Currently selected world map type - Persist - 1 - Type - S32 - Value - 0 - MapScale Comment @@ -7104,17 +6794,6 @@ Value 0 - RadioLandBrushSize - - Comment - Size of land modification brush (0 = small, 1 = medium, 2 = large) - Persist - 1 - Type - S32 - Value - 0 - LandBrushForce Comment @@ -7126,17 +6805,6 @@ Value 1.0 - MediaBrowserWindowLimit - - Comment - Maximum number of media brower windows that can be open at once in the media browser floater (0 for no limit) - Persist - 1 - Type - S32 - Value - 5 - WebContentWindowLimit Comment @@ -7415,17 +7083,6 @@ Value 0 - RenderAvatar - - Comment - Render Avatars - Persist - 0 - Type - Boolean - Value - 1 - RenderAvatarCloth Comment @@ -9801,17 +9458,6 @@ Value 0 - SecondLifeEnterprise - - Comment - Enables Second Life Enterprise features - Persist - 1 - Type - Boolean - Value - 0 - SelectMovableOnly Comment @@ -10065,17 +9711,6 @@ Value 0 - ShowEmptyFoldersWhenSearching - - Comment - Shows folders that do not have any visible contents when applying a filter to inventory - Persist - 1 - Type - Boolean - Value - 0 - ShowEventRecorderMenuItems Comment @@ -10417,136 +10052,6 @@ Value 1 - ShowPGSearchAll - - Comment - Display results of search All that are flagged as general - Persist - 1 - HideFromEditor - 1 - Type - Boolean - Value - 1 - - ShowMatureSearchAll - - Comment - Display results of search All that are flagged as moderate - Persist - 1 - HideFromEditor - 1 - Type - Boolean - Value - 0 - - ShowAdultSearchAll - - Comment - Display results of search All that are flagged as adult - Persist - 1 - HideFromEditor - 1 - Type - Boolean - Value - 0 - - ShowPGGroups - - Comment - Display results of find groups that are flagged as general - Persist - 1 - HideFromEditor - 1 - Type - Boolean - Value - 1 - - ShowMatureGroups - - Comment - Display results of find groups that are flagged as moderate - Persist - 1 - HideFromEditor - 1 - Type - Boolean - Value - 0 - - ShowAdultGroups - - Comment - Display results of find groups that are flagged as adult - Persist - 1 - HideFromEditor - 1 - Type - Boolean - Value - 0 - - ShowPGClassifieds - - Comment - Display results of find classifieds that are flagged as general - Persist - 1 - HideFromEditor - 1 - Type - Boolean - Value - 1 - - ShowMatureClassifieds - - Comment - Display results of find classifieds that are flagged as moderate - Persist - 1 - HideFromEditor - 1 - Type - Boolean - Value - 0 - - ShowAdultClassifieds - - Comment - Display results of find classifieds that are flagged as adult - Persist - 1 - HideFromEditor - 1 - Type - Boolean - Value - 0 - - ShowPGEvents - - Comment - Display results of find events that are flagged as general - Persist - 1 - HideFromEditor - 1 - Type - Boolean - Value - 1 - ShowMatureEvents Comment @@ -10782,17 +10287,6 @@ Boolean Value 0 - - ShowToolBar - - Comment - Show toolbar at bottom of screen - Persist - 1 - Type - Boolean - Value - 1 ShowTutorial @@ -11389,28 +10883,6 @@ Value 1 - TexturePickerShowFolders - - Comment - Show folders with no texures in texture picker - Persist - 1 - Type - Boolean - Value - 1 - - TexturePickerSortOrder - - Comment - Specifies sort key for textures in texture picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top) - Persist - 1 - Type - U32 - Value - 2 - TextureReverseByteRange Comment @@ -11458,17 +10930,6 @@ Value 3000.0 - UpdaterMaximumBandwidth - - Comment - Obsolete: this parameter is no longer used. - Persist - 1 - Type - F32 - Value - 500.0 - ToolTipDelay Comment @@ -11667,28 +11128,6 @@ Value 6 - UICheckboxctrlBtnSize - - Comment - UI Checkbox Control Button Size - Persist - 1 - Type - S32 - Value - 13 - - UICheckboxctrlHeight - - Comment - UI Checkbox Control Height - Persist - 1 - Type - S32 - Value - 16 - UICheckboxctrlHPad Comment @@ -12096,17 +11535,6 @@ Value 1.0 - LastSystemUIScaleFactor - - Comment - OBSOLETE: System UI scale factor is now automatically and independently from UIScaleFactor applied - Persist - 1 - Type - F32 - Value - 1.0 - UIScrollbarSize Comment @@ -12426,17 +11854,6 @@ Value 16 - UISpinctrlDefaultLabelWidth - - Comment - UI spin control default label width - Persist - 1 - Type - S32 - Value - 10 - UISpinctrlSpacing Comment @@ -12558,39 +11975,6 @@ Value 3 - UpdaterServiceCheckPeriod - - Comment - Obsolete; no longer used. - Persist - 0 - Type - U32 - Value - 3600 - - UpdaterServiceURL - - Comment - Obsolete; no longer used. - Persist - 0 - Type - String - Value - https://update.secondlife.com - - UpdaterServicePath - - Comment - Obsolete: no longer used - Persist - 0 - Type - String - Value - update - UpdaterWillingToTest Comment @@ -12789,17 +12173,6 @@ Value 0 - SocialPhotoResolution - - Comment - Default resolution when sharing photo using the social floaters - Persist - 1 - Type - String - Value - [i800,i600] - sourceid Comment From 5713d1a3fdad397c2f9071bdc39db976950b97b1 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Wed, 27 Sep 2023 11:53:23 +0200 Subject: [PATCH 7/8] SL-20345 Avoid of ASSERT (\!mRootVolp) in LLControlAvatar::~LLControlAvatar() --- indra/newview/llcontrolavatar.cpp | 1 + indra/newview/llviewerobject.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index a71c8bb60f..000c2c625b 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -362,6 +362,7 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time) void LLControlAvatar::markDead() { + mRootVolp = NULL; super::markDead(); mControlAVBridge = NULL; } diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 55a6d19103..8607c832b5 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3178,7 +3178,6 @@ void LLViewerObject::unlinkControlAvatar() if (mControlAvatar) { mControlAvatar->markForDeath(); - mControlAvatar->mRootVolp = NULL; mControlAvatar = NULL; } } From 08579cdb1968979b43d9bc8df54e6f2ecfa60051 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Wed, 27 Sep 2023 12:23:15 +0200 Subject: [PATCH 8/8] SL-20346 Avoid of ASSERT (pos.isFinite()) in drawBoxOutline() --- indra/newview/llspatialpartition.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 39ed23e131..8bd40f2f31 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1300,17 +1300,8 @@ void drawBox(const LLVector4a& c, const LLVector4a& r) void drawBoxOutline(const LLVector3& pos, const LLVector3& size) { - - llassert(pos.isFinite()); - llassert(size.isFinite()); - - llassert(!llisnan(pos.mV[0])); - llassert(!llisnan(pos.mV[1])); - llassert(!llisnan(pos.mV[2])); - - llassert(!llisnan(size.mV[0])); - llassert(!llisnan(size.mV[1])); - llassert(!llisnan(size.mV[2])); + if (!pos.isFinite() || !size.isFinite()) + return; LLVector3 v1 = size.scaledVec(LLVector3( 1, 1,1)); LLVector3 v2 = size.scaledVec(LLVector3(-1, 1,1));