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/llviewermenufile.h | |
| 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/llviewermenufile.h')
| -rwxr-xr-x | indra/newview/llviewermenufile.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h index bb7cfce862..08444551a9 100755 --- a/indra/newview/llviewermenufile.h +++ b/indra/newview/llviewermenufile.h @@ -74,7 +74,6 @@ void upload_new_resource( S32 expected_upload_cost, void *userdata); -#if LL_MESH_ENABLED // TODO* : Move all uploads to use this new function // since at some point, that upload path will be deprecated and no longer // used @@ -92,7 +91,6 @@ BOOL upload_new_variable_price_resource( U32 everyone_perms, const std::string& display_name, const LLSD& asset_resources); -#endif LLAssetID generate_asset_id_for_new_upload(const LLTransactionID& tid); void increase_new_upload_stats(LLAssetType::EType asset_type); |