OpenSimulator GForge > Projects > Cable Beach Asset Server > SVN

Diff of /trunk/AssetServer/Extensions/Simple/SimpleInventory.cs

-revision 65, Fri Jan  9 02:24:28 2009 UTC
+revision 66, Fri Jan  9 23:05:23 2009 UTC
 Line 122
              {
                  InventoryCollection collection;
                  InventoryFolder folder;
-                 UUID ownerID;
-                 if (inventories.TryGetValue(owner, out collection) && collection.Folders.TryGetValue(folderID, out folder) &&
+                 if (inventories.TryGetValue(owner, out collection) && collection.Folders.TryGetValue(folderID, out folder))
-                     Utils.OwnerMap.TryGetUUID(owner, out ownerID))
                  {
                      contents = new InventoryCollection();
-                     contents.UserID = ownerID;
+                     contents.UserID = collection.UserID;
                      contents.Folders = new Dictionary<UUID, InventoryFolder>();
                      contents.Items = new Dictionary<UUID, InventoryItem>();
-Line 230
+Line 229
              return ret;
          }
-         public StorageResponse TryCreateItem(InventoryItem item, UUID authToken)
+         public StorageResponse TryCreateItem(Uri owner, InventoryItem item, UUID authToken)
          {
              StorageResponse ret;
-             Uri owner;
-             if (Utils.OwnerMap.TryGetUri(item.Owner, out owner))
-             {
                  if (server.AuthorizationProvider.IsInventoryWriteAuthorized(authToken, owner))
                  {
                      InventoryCollection collection;
-Line 284
+Line 280
                  {
                      return StorageResponse.AuthNeeded;
                  }
-             }
-             else
-             {
-                 return StorageResponse.NotFound;
-             }
              server.MetricsProvider.LogInventoryCreate(EXTENSION_NAME, ret, owner, false, authToken, DateTime.Now);
              return ret;
          }
-         public StorageResponse TryCreateFolder(InventoryFolder folder, UUID authToken)
+         public StorageResponse TryCreateFolder(Uri owner, InventoryFolder folder, UUID authToken)
          {
              StorageResponse ret;
-             Uri owner;
-             if (Utils.OwnerMap.TryGetUri(folder.Owner, out owner))
-             {
                  if (server.AuthorizationProvider.IsInventoryWriteAuthorized(authToken, owner))
                  {
                      InventoryCollection collection;
-Line 341
+Line 329
                  {
                      ret = StorageResponse.AuthNeeded;
                  }
-             }
-             else
-             {
-                 ret = StorageResponse.NotFound;
-             }
              server.MetricsProvider.LogInventoryCreate(EXTENSION_NAME, ret, owner, true, authToken, DateTime.Now);
              return ret;
          }
-         public StorageResponse TryCreateInventory(InventoryFolder rootFolder, UUID authToken)
+         public StorageResponse TryCreateInventory(Uri owner, InventoryFolder rootFolder, UUID authToken)
          {
              StorageResponse ret;
-             Uri owner;
-             if (Utils.OwnerMap.TryGetUri(rootFolder.Owner, out owner))
-             {
                  if (server.AuthorizationProvider.IsInventoryWriteAuthorized(authToken, owner))
                  {
                      lock (inventories)
-Line 406
+Line 386
                  {
                      ret = StorageResponse.AuthNeeded;
                  }
-             }
-             else
-             {
-                 ret = StorageResponse.NotFound;
-             }
              server.MetricsProvider.LogInventoryCreateInventory(EXTENSION_NAME, ret, authToken, DateTime.Now);
              return ret;
-Line 653
+Line 628
                      if (ownerID != UUID.Zero && owner != null)
                      {
-                         // Add a mapping between the UUID and Uri for this owner
-                         Utils.OwnerMap.Add(ownerID, owner);
                          // Initialize the active gestures list for this agent
                          activeGestures.Add(owner, new List<InventoryItem>());
-Line 697
+Line 669
                                  parent.Children[invItem.ID] = invItem;
                              // Add active gestures to our list
-                             if (invItem.InvType == (int)InventoryType.Gesture && invItem.Flags == 1)
+                             if (invItem.InvType == (int)InventoryType.Gesture && invItem.Flags != 0)
                                  activeGestures[owner].Add(invItem);
                          }

 Legend:



Removed from v.65
 


changed lines


 
Added in v.66
 Legend:



Removed from v.65
 


changed lines


 
Added in v.66
-Removed from v.65
+Added in v.66

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Cable Beach Asset Server

Diff of /trunk/AssetServer/Extensions/Simple/SimpleInventory.cs