diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-10 00:45:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-10 00:45:48 -0500 |
| commit | f9b13d8f8510b1f7f02fcf92685471461b79858e (patch) | |
| tree | 72e3469605fb33aedc211649778c22ada2719d5c /indra/newview/llassetuploadresponders.h | |
| parent | c2da9f5d2cc86af0af34199c53e872fbff22637b (diff) | |
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
Diffstat (limited to 'indra/newview/llassetuploadresponders.h')
| -rw-r--r-- | indra/newview/llassetuploadresponders.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h index af3b3daf46..9abaccfde0 100644 --- a/indra/newview/llassetuploadresponders.h +++ b/indra/newview/llassetuploadresponders.h @@ -61,7 +61,7 @@ protected: std::string mFileName; }; - +#if LL_MESH_ENABLED // TODO*: Remove this once deprecated class LLNewAgentInventoryResponder : public LLAssetUploadResponder { @@ -116,6 +116,7 @@ private: class Impl; Impl* mImpl; }; +#endif struct LLBakedUploadData; class LLSendTexLayerResponder : public LLAssetUploadResponder |