diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-08-05 16:58:38 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-08-05 16:58:38 -0500 |
| commit | 8007b43876831a0d88833bdc8fd7eb6d543dd38b (patch) | |
| tree | c5c34cbb5c9a9c7bd915b331abb17ab914e3f53a /indra/newview/llvovolume.h | |
| parent | d048795fce3ab83989cb909fde02014f1442cc84 (diff) | |
| parent | aca495c8812d49a5fde80ecefbf3f609b4042bf9 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index db586fd741..391351c13e 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -236,7 +236,7 @@ public: void updateFaceFlags(); void regenFaces(); - BOOL genBBoxes(BOOL force_global); + BOOL genBBoxes(BOOL force_global, BOOL should_update_octree_bounds = TRUE); void preRebuild(); virtual void updateSpatialExtents(LLVector4a& min, LLVector4a& max) override; virtual F32 getBinRadius() override; @@ -403,13 +403,14 @@ protected: static S32 mRenderComplexity_last; static S32 mRenderComplexity_current; + void onDrawableUpdateFromServer(); void requestMediaDataUpdate(bool isNew); void cleanUpMediaImpls(); void addMediaImpl(LLViewerMediaImpl* media_impl, S32 texture_index) ; void removeMediaImpl(S32 texture_index) ; private: - bool lodOrSculptChanged(LLDrawable *drawable, BOOL &compiled); + bool lodOrSculptChanged(LLDrawable *drawable, BOOL &compiled, BOOL &shouldUpdateOctreeBounds); public: @@ -441,6 +442,7 @@ private: LLPointer<LLViewerFetchedTexture> mLightTexture; media_list_t mMediaImplList; S32 mLastFetchedMediaVersion; // as fetched from the server, starts as -1 + U32 mServerDrawableUpdateCount; S32 mIndexInTex[LLRender::NUM_VOLUME_TEXTURE_CHANNELS]; S32 mMDCImplCount; |