From b561f3b29f24b6cd194cb4add2a9ea420b46d4a6 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 5 Aug 2017 14:14:43 +0200 Subject: [PATCH 1/5] Remove orphaned code --- indra/newview/llpanelmaininventory.cpp | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 99c608ad9b..360fb19031 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -1564,28 +1564,6 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata) } LLFloaterReg::showInstance("linkreplace", params); } - - // Inventory Links Replace - if (command_name == "replace_links") - { - LLSD params; - LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem(); - if (current_item) - { - LLInvFVBridge* bridge = (LLInvFVBridge*)current_item->getViewModelItem(); - - if (bridge) - { - LLInventoryObject* obj = bridge->getInventoryObject(); - if (obj && obj->getType() != LLAssetType::AT_CATEGORY && obj->getActualType() != LLAssetType::AT_LINK_FOLDER) - { - params = LLSD(obj->getUUID()); - } - } - } - LLFloaterReg::showInstance("fs_linkreplace", params); - } - // } void LLPanelMainInventory::onVisibilityChange( BOOL new_visibility ) From 8bf81f34b0c85f55aa31899848747c0ed1c39a06 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 10 Aug 2017 01:12:50 +0200 Subject: [PATCH 2/5] Remove orphaned readme file --- indra/lscript/README | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 indra/lscript/README diff --git a/indra/lscript/README b/indra/lscript/README deleted file mode 100644 index 816ddebdbe..0000000000 --- a/indra/lscript/README +++ /dev/null @@ -1,34 +0,0 @@ -We no longer use lscript in Firestorm. legacy LSO compilation is no longer used in -Second Life or OpenSim, and this removes the dependency on Bison for building along -with continued compatibility problems with the build system (OSX 10.8, Opensuse 12.3, etc) - -This directory is not used as of Rev 34229. - --- -Cinder - -Please enjoy this ascii-art. - - ____ - \%%%%%%;. - \%%%%%%%%;.. - .\. (%%%%%%%%%%%%;. - .;%%%;. %%%%%%%%%%%%%%%%%;. - %%%%%%%%; %%%%%%%%%%%%%%%%%%%%%;. - %%%%%%%%%)__(%%%%%%%%%%%%%%%%%%%%%%%%;. - ;%%%%%% /%%%%%\ %%%%%%%%%%%%%%%%%%%%%%%; - \%% /%/'''\%%%\ %%%%%%%%%%%%%%%%%%%%%%%; - '%%%%%%%\. \%%|/%%%%%%%%%%%%%%%%%%%%%%; %% - .;%%%%%%%%%%\|%%%%%%%%%%%%%%%%%%%%%%%%%% %%% - (%CCC%%%%CCC%\%%%%%%%%%%%%%%%%%%%%%%%%%/ %%%% - %% !/ \%%%%%%%%%%%%%%%%%%%%%%/ %%%%%% - .% %%% \%%%%%%%%%%%%%/'%%%%%%%%% - .__\\/__. .%%% o o %%%% %%%%%%%%%%%/'%%%%%%%%%%% - \.;%%%%%%%%%;.'%% %%%% ,%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%/ %___.!. /%%%% ,%%%%%%%% \%%%%%%%%%%%%% - \%% %%% %%/ %%%%%%\ /%%%% ,%%%%%%%%% |%%%%%%%%%%%%% -/%% %%% %% %%%%%%%)?**&%%%% ,%%%%%%%%%%; |%%%%%%%%%%%%% - %% %%% %% %%%%%%%%%%%%%/ ,%%%%%%%%%%%/ /%%%%%%%%%%%%%% -/%%% %%%%% %%% %%%%%%%;/',;/%%%%%%%%%;;../%%%%%%%%%%%%%%%%% - %%%%%%/'''\%%%%%% ='''\\ \%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - //'' ''\\ From 9c75a8105caf42e2027b99d90a27c0e9083d3083 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 20 Aug 2017 18:06:09 +0200 Subject: [PATCH 3/5] Experimental fix for animation speed of impostored avatars, based on a fix of Henri Beauchamp --- indra/llcharacter/llmotioncontroller.cpp | 6 +++++- indra/llcharacter/llmotioncontroller.h | 4 ++++ indra/newview/app_settings/settings.xml | 2 +- indra/newview/llvoavatar.cpp | 22 +++++++++++++++++----- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index d8185aa693..184fbab57f 100644 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -129,6 +129,7 @@ LLMotion *LLMotionRegistry::createMotion( const LLUUID &id ) //----------------------------------------------------------------------------- LLMotionController::LLMotionController() : mTimeFactor(sCurrentTimeFactor), + mUpdateFactor(1.f), // Fix impostered animation speed based on a fix by Henri Beauchamp mCharacter(NULL), mAnimTime(0.f), mPrevTimerElapsed(0.f), @@ -825,7 +826,10 @@ void LLMotionController::updateMotions(bool force_update) // Update timing info for this time step. if (!mPaused) { - F32 update_time = mAnimTime + delta_time * mTimeFactor; + // Fix impostered animation speed based on a fix by Henri Beauchamp + //F32 update_time = mAnimTime + delta_time * mTimeFactor; + F32 update_time = mAnimTime + delta_time * mTimeFactor * mUpdateFactor; + // if (use_quantum) { F32 time_interval = fmodf(update_time, mTimeStep); diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h index 72de331694..d449c3649c 100644 --- a/indra/llcharacter/llmotioncontroller.h +++ b/indra/llcharacter/llmotioncontroller.h @@ -154,6 +154,9 @@ public: void setTimeFactor(F32 time_factor); F32 getTimeFactor() const { return mTimeFactor; } + // Fix impostered animation speed based on a fix by Henri Beauchamp + void setUpdateFactor(F32 update_factor) { mUpdateFactor = update_factor; } + motion_list_t& getActiveMotions() { return mActiveMotions; } void incMotionCounts(S32& num_motions, S32& num_loading_motions, S32& num_loaded_motions, S32& num_active_motions, S32& num_deprecated_motions); @@ -191,6 +194,7 @@ protected: protected: F32 mTimeFactor; // 1.f for normal speed static F32 sCurrentTimeFactor; // Value to use for initialization + F32 mUpdateFactor; // Fix impostered animation speed based on a fix by Henri Beauchamp static LLMotionRegistry sRegistry; LLPoseBlender mPoseBlender; diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c0f8888cb0..c2ee2f2344 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -23299,7 +23299,7 @@ Change of this parameter will affect the layout of buttons in notification toast Type Boolean Value - 0 + 1 diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index eaad4ab4ae..ffacfbbdae 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4050,11 +4050,13 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) // don't early out for your own avatar, as we rely on your animations playing reliably // for example, the "turn around" animation when entering customize avatar needs to trigger // even when your avatar is offscreen - if (!visible && !isSelf()) - { - updateMotions(LLCharacter::HIDDEN_UPDATE); - return FALSE; - } + // Fix impostered animation speed based on a fix by Henri Beauchamp + //if (!visible && !isSelf()) + //{ + // updateMotions(LLCharacter::HIDDEN_UPDATE); + // return FALSE; + //} + // // Optionally disable the usage of timesteps, testing if this affects performance or // creates animation issues - FIRE-3657 @@ -4074,6 +4076,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) removeAnimationData("Walk Speed"); } mMotionController.setTimeStep(time_step); + mMotionController.setUpdateFactor(mUpdatePeriod); // Fix impostered animation speed based on a fix by Henri Beauchamp // LL_INFOS() << "Setting timestep to " << time_quantum * pixel_area_scale << LL_ENDL; } // Optionally disable the usage of timesteps, testing if this affects performance or @@ -4081,9 +4084,18 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) else { mMotionController.setTimeStep(0.0f); + mMotionController.setUpdateFactor(mUpdatePeriod); // Fix impostered animation speed based on a fix by Henri Beauchamp } // + // Fix impostered animation speed based on a fix by Henri Beauchamp + if (!visible && !isSelf()) + { + updateMotions(LLCharacter::HIDDEN_UPDATE); + return FALSE; + } + // + if (getParent() && !mIsSitting) { sitOnObject((LLViewerObject*)getParent()); From 9c2e630ce7eb9fc62a6f3b23a2778b6f93001bf4 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Wed, 9 Aug 2017 00:04:25 +0300 Subject: [PATCH 4/5] MAINT-7652 Fix for crash in LLVertexBuffer::~LLVertexBuffer() destructor --- indra/llrender/llvertexbuffer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index e07391d0d1..cf760e8189 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -1319,7 +1319,7 @@ void LLVertexBuffer::createGLIndices(U32 size) void LLVertexBuffer::destroyGLBuffer() { - if (mGLBuffer) + if (mGLBuffer || mMappedData) { if (mMappedDataUsingVBOs) { @@ -1339,7 +1339,7 @@ void LLVertexBuffer::destroyGLBuffer() void LLVertexBuffer::destroyGLIndices() { - if (mGLIndices) + if (mGLIndices || mMappedIndexData) { if (mMappedIndexDataUsingVBOs) { From ebab20eab162956005972500939237025ad8df39 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 20 Aug 2017 21:49:50 +0200 Subject: [PATCH 5/5] Keep UseAnimationTimeSteps disabled or non-impostored avatars at distance play ridiculously fast --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c2ee2f2344..c0f8888cb0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -23299,7 +23299,7 @@ Change of this parameter will affect the layout of buttons in notification toast Type Boolean Value - 1 + 0