diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-22 03:04:21 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-22 03:04:21 -0500 |
| commit | cf09d6c58a741263cddcf338c2f79836873475b1 (patch) | |
| tree | 38c5adaf911371f72176485d0ddf13f029cee431 /indra/newview/llassetuploadresponders.cpp | |
| parent | 7d625ef060c9916268c479ab817b24ac1d23199f (diff) | |
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
| -rwxr-xr-x | indra/newview/llassetuploadresponders.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index afb76735ec..d44fb84f14 100755 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -305,7 +305,6 @@ void LLAssetUploadResponder::uploadComplete(const LLSD& content) { } -#if LL_MESH_ENABLED LLNewAgentInventoryResponder::LLNewAgentInventoryResponder( const LLSD& post_data, const LLUUID& vfile_id, @@ -427,7 +426,6 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content) LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], TRUE); } -#endif LLSendTexLayerResponder::LLSendTexLayerResponder(const LLSD& post_data, const LLUUID& vfile_id, @@ -677,7 +675,6 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content) } -#if LL_MESH_ENABLED ///////////////////////////////////////////////////// // LLNewAgentInventoryVariablePriceResponder::Impl // ///////////////////////////////////////////////////// @@ -1145,5 +1142,5 @@ void LLNewAgentInventoryVariablePriceResponder::showConfirmationDialog( boost::intrusive_ptr<LLNewAgentInventoryVariablePriceResponder>(this))); } } -#endif + |