diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-08-17 16:31:28 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-08-17 16:31:28 -0400 |
commit | 72d5ff36f56c4afee85f5863f64f237980341014 (patch) | |
tree | 3afd0fa622ad507e087d7b5b2d6724a71119cbec /indra/llprimitive/llmodelloader.h | |
parent | 9044a8b8156e5812f99c39d35be096a35df8f6d0 (diff) |
MAINT-6647 - ignore previously created slm files on model upload. SL-442 - change coloring for show bones, to highlight joint positions and rigging
Diffstat (limited to 'indra/llprimitive/llmodelloader.h')
-rw-r--r-- | indra/llprimitive/llmodelloader.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h index a902ca3404..d64e0a0773 100644 --- a/indra/llprimitive/llmodelloader.h +++ b/indra/llprimitive/llmodelloader.h @@ -137,7 +137,9 @@ public: virtual void setNoOptimize() { mNoOptimize = true; } virtual void run(); - + + static bool getSLMFilename(const std::string& model_filename, std::string& slm_filename); + // Will try SLM or derived class OpenFile as appropriate // virtual bool doLoadModel(); |