diff options
author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-22 13:04:53 -0700 |
---|---|---|
committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-22 13:04:53 -0700 |
commit | 569f3f4b06fc2f5a0fa658a49d519428983403f9 (patch) | |
tree | 3fdafee487d0b922793ff864970ce73f223cd861 /indra/newview/llassetuploadresponders.h | |
parent | 05c2f451dcbb7fdfb6d45d8b65ec71ba6b799af4 (diff) | |
parent | 6d8e9cd8bde57bd033beeb9610f7094c19655ed1 (diff) |
Merge
Diffstat (limited to 'indra/newview/llassetuploadresponders.h')
-rw-r--r-- | indra/newview/llassetuploadresponders.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h index a85e84e9f8..268220d4a6 100644 --- a/indra/newview/llassetuploadresponders.h +++ b/indra/newview/llassetuploadresponders.h @@ -34,7 +34,6 @@ #define LL_LLASSETUPLOADRESPONDER_H #include "llhttpclient.h" -#include "llvolume.h" //for LL_MESH_ENABLED // Abstract class for supporting asset upload // via capabilities @@ -62,7 +61,6 @@ protected: std::string mFileName; }; -#if LL_MESH_ENABLED // TODO*: Remove this once deprecated class LLNewAgentInventoryResponder : public LLAssetUploadResponder { @@ -116,7 +114,6 @@ private: class Impl; Impl* mImpl; }; -#endif struct LLBakedUploadData; class LLSendTexLayerResponder : public LLAssetUploadResponder |