Mesh upload: moved collada library into it's own namespace

2014-06-27 22:48:28 +02:00
parent 9043124aaf
commit f2d2d6b29d
3 changed files with 9 additions and 1 deletions
--- a/OpenMetaverse/ImportExport/ModelUploader.cs
+++ b/OpenMetaverse/ImportExport/ModelUploader.cs
@@ -184,6 +184,12 @@ namespace OpenMetaverse.ImportExport
        {
            PrepareUpload((result =>
            {
+                if (result == null && callback != null)
+                {
+                    callback(null);
+                    return;
+                }
+
                if (result is OSDMap)
                {
                    var res = (OSDMap)result;
@@ -218,6 +224,7 @@ namespace OpenMetaverse.ImportExport
                null == (url = Client.Network.CurrentSim.Caps.CapabilityURI("NewFileAgentInventory")))
            {
                Logger.Log("Cannot upload mesh, no connection or NewFileAgentInventory not available", Helpers.LogLevel.Warning);
+                if (callback != null) callback(null);
                return;
            }