diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-22 20:40:45 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-22 20:40:45 -0400 |
| commit | d7eb9b36fe7c801d9bbb554ef40c3d8d712f5bfb (patch) | |
| tree | 6ecfd42c64c4ca452a7f32f74a72775536afb88a /indra/llprimitive | |
| parent | 29dc641fbe7ab77f77fe19e2e7976980f0649b5b (diff) | |
| parent | 89e09646824122e20194400e93bcdb0b212f96fe (diff) | |
pulling from mesh development. merge.
Diffstat (limited to 'indra/llprimitive')
| -rwxr-xr-x | indra/llprimitive/llmodel.cpp | 1 | ||||
| -rwxr-xr-x | indra/llprimitive/llmodel.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index eed82f924b..3669fef0dc 100755 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -60,6 +60,7 @@ LLModel::LLModel(LLVolumeParams& params, F32 detail) , mPelvisOffset( 0.0f ) { mDecompID = -1; + mLocalID = -1; } LLModel::~LLModel() diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index e9e33bdee5..addf527d8d 100755 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -205,6 +205,9 @@ public: std::vector<LLVector3> mHullCenter; U32 mHullPoints; + //ID for storing this model in a .slm file + S32 mLocalID; + protected: void addVolumeFacesFromDomMesh(domMesh* mesh); virtual BOOL createVolumeFacesFromFile(const std::string& file_name); |