diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 21:54:21 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 21:54:21 +0200 |
| commit | 73eec8913135127a1d31d3f1dc766f96908f984d (patch) | |
| tree | 66ae3fec58046505fc80b15352957696d1ab4378 /indra/newview/llmodelpreview.h | |
| parent | ce6dd53f9c364f46e30d0eedb1c6a701fbad8885 (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge branch 'master' into DRTVWR-540-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
Diffstat (limited to 'indra/newview/llmodelpreview.h')
| -rw-r--r-- | indra/newview/llmodelpreview.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h index 3664a27a72..8e59c71a55 100644 --- a/indra/newview/llmodelpreview.h +++ b/indra/newview/llmodelpreview.h @@ -115,7 +115,7 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex { LOG_CLASS(LLModelPreview); - typedef boost::signals2::signal<void(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost)> details_signal_t; + typedef boost::signals2::signal<void(F32 x, F32 y, F32 z)> details_signal_t; typedef boost::signals2::signal<void(void)> model_loaded_signal_t; typedef boost::signals2::signal<void(bool)> model_updated_signal_t; @@ -158,7 +158,7 @@ public: void genLODs(S32 which_lod = -1, U32 decimation = 3, bool enforce_tri_limit = false); void generateNormals(); void restoreNormals(); - U32 calcResourceCost(); + void updateDimentionsAndOffsets(); void rebuildUploadData(); void saveUploadData(bool save_skinweights, bool save_joint_positions, bool lock_scale_if_joint_position); void saveUploadData(const std::string& filename, bool save_skinweights, bool save_joint_positions, bool lock_scale_if_joint_position); @@ -239,7 +239,6 @@ protected: LLVector3 mPreviewScale; S32 mPreviewLOD; S32 mPhysicsSearchLOD; - U32 mResourceCost; std::string mLODFile[LLModel::NUM_LODS]; bool mLoading; U32 mLoadState; |