diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-03-25 20:07:21 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-03-25 20:07:21 +0200 |
| commit | 051052b141ef5c2c3a2f08a9d69b7b982386c8c4 (patch) | |
| tree | fd63b1bb841ae221fc32ad5ae2e25057c0e75903 /indra/llprimitive/lldaeloader.h | |
| parent | f930cd149299c520b5147ddf72d50c57985b6d66 (diff) | |
MAINT-4983 Mesh upload of large model ryoma 3d loads indefinitely
Diffstat (limited to 'indra/llprimitive/lldaeloader.h')
| -rw-r--r-- | indra/llprimitive/lldaeloader.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h index e71c407909..cd07ade282 100644 --- a/indra/llprimitive/lldaeloader.h +++ b/indra/llprimitive/lldaeloader.h @@ -55,7 +55,8 @@ public: LLModelLoader::state_callback_t state_cb, void* opaque_userdata, JointTransformMap& jointMap, - JointSet& jointsFromNodes); + JointSet& jointsFromNodes, + U32 modelLimit); virtual ~LLDAELoader() ; virtual bool OpenFile(const std::string& filename); @@ -93,11 +94,12 @@ protected: // Loads a mesh breaking it into one or more models as necessary // to get around volume face limitations while retaining >8 materials // - bool loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& models_out); + bool loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& models_out, U32 submodel_limit); static std::string getElementLabel(daeElement *element); private: + U32 mGeneratedModelLimit; // Attempt to limit amount of generated submodels }; #endif // LL_LLDAELLOADER_H |