aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/InventoryService
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Services/InventoryService
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Services/InventoryService')
-rw-r--r--OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs44
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs38
3 files changed, 45 insertions, 45 deletions
diff --git a/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs b/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
index 7295103..2e3fb3e 100644
--- a/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Services.InventoryService")] 8[assembly: AssemblyTitle("OpenSim.Services.InventoryService")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
diff --git a/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs b/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs
index 3cfd125..2e4637c 100644
--- a/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs
+++ b/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Services.InventoryService.Tests
47 { 47 {
48 private IInventoryService CreateXInventoryService() 48 private IInventoryService CreateXInventoryService()
49 { 49 {
50 IConfigSource config = new IniConfigSource(); 50 IConfigSource config = new IniConfigSource();
51 config.AddConfig("InventoryService"); 51 config.AddConfig("InventoryService");
52 config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); 52 config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
53 53
@@ -73,19 +73,19 @@ namespace OpenSim.Services.InventoryService.Tests
73 UUID folderId = TestHelpers.ParseTail(0x30); 73 UUID folderId = TestHelpers.ParseTail(0x30);
74 int invType = (int)InventoryType.Animation; 74 int invType = (int)InventoryType.Animation;
75 int assetType = (int)AssetType.Animation; 75 int assetType = (int)AssetType.Animation;
76 string itemName = "item1"; 76 string itemName = "item1";
77 77
78 IInventoryService xis = CreateXInventoryService(); 78 IInventoryService xis = CreateXInventoryService();
79 79
80 InventoryItemBase itemToStore 80 InventoryItemBase itemToStore
81 = new InventoryItemBase(itemId, ownerId) 81 = new InventoryItemBase(itemId, ownerId)
82 { 82 {
83 CreatorIdentification = creatorId.ToString(), 83 CreatorIdentification = creatorId.ToString(),
84 AssetID = assetId, 84 AssetID = assetId,
85 Name = itemName, 85 Name = itemName,
86 Folder = folderId, 86 Folder = folderId,
87 InvType = invType, 87 InvType = invType,
88 AssetType = assetType 88 AssetType = assetType
89 }; 89 };
90 90
91 Assert.That(xis.AddItem(itemToStore), Is.True); 91 Assert.That(xis.AddItem(itemToStore), Is.True);
@@ -115,20 +115,20 @@ namespace OpenSim.Services.InventoryService.Tests
115 UUID folderId = TestHelpers.ParseTail(0x30); 115 UUID folderId = TestHelpers.ParseTail(0x30);
116 int invType = (int)InventoryType.Animation; 116 int invType = (int)InventoryType.Animation;
117 int assetType = (int)AssetType.Animation; 117 int assetType = (int)AssetType.Animation;
118 string itemName = "item1"; 118 string itemName = "item1";
119 string itemName2 = "item2"; 119 string itemName2 = "item2";
120 120
121 IInventoryService xis = CreateXInventoryService(); 121 IInventoryService xis = CreateXInventoryService();
122 122
123 InventoryItemBase itemToStore 123 InventoryItemBase itemToStore
124 = new InventoryItemBase(itemId, ownerId) 124 = new InventoryItemBase(itemId, ownerId)
125 { 125 {
126 CreatorIdentification = creatorId.ToString(), 126 CreatorIdentification = creatorId.ToString(),
127 AssetID = assetId, 127 AssetID = assetId,
128 Name = itemName, 128 Name = itemName,
129 Folder = folderId, 129 Folder = folderId,
130 InvType = invType, 130 InvType = invType,
131 AssetType = assetType 131 AssetType = assetType
132 }; 132 };
133 133
134 Assert.That(xis.AddItem(itemToStore), Is.True); 134 Assert.That(xis.AddItem(itemToStore), Is.True);
@@ -149,7 +149,7 @@ namespace OpenSim.Services.InventoryService.Tests
149 UUID folderId2 = TestHelpers.ParseTail(0x70); 149 UUID folderId2 = TestHelpers.ParseTail(0x70);
150 int invType2 = (int)InventoryType.CallingCard; 150 int invType2 = (int)InventoryType.CallingCard;
151 int assetType2 = (int)AssetType.CallingCard; 151 int assetType2 = (int)AssetType.CallingCard;
152 string itemName3 = "item3"; 152 string itemName3 = "item3";
153 153
154 itemToStore.CreatorIdentification = creatorId2.ToString(); 154 itemToStore.CreatorIdentification = creatorId2.ToString();
155 itemToStore.Owner = ownerId2; 155 itemToStore.Owner = ownerId2;
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 004c4bf..b8ed46c 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Services.InventoryService
176 protected virtual XInventoryFolder[] GetSystemFolders(UUID principalID, UUID rootID) 176 protected virtual XInventoryFolder[] GetSystemFolders(UUID principalID, UUID rootID)
177 { 177 {
178// m_log.DebugFormat("[XINVENTORY SERVICE]: Getting system folders for {0}", principalID); 178// m_log.DebugFormat("[XINVENTORY SERVICE]: Getting system folders for {0}", principalID);
179 179
180 XInventoryFolder[] allFolders = m_Database.GetFolders( 180 XInventoryFolder[] allFolders = m_Database.GetFolders(
181 new string[] { "agentID", "parentFolderID" }, 181 new string[] { "agentID", "parentFolderID" },
182 new string[] { principalID.ToString(), rootID.ToString() }); 182 new string[] { principalID.ToString(), rootID.ToString() });
@@ -192,7 +192,7 @@ namespace OpenSim.Services.InventoryService
192 192
193// m_log.DebugFormat( 193// m_log.DebugFormat(
194// "[XINVENTORY SERVICE]: Found {0} system folders for {1}", sysFolders.Length, principalID); 194// "[XINVENTORY SERVICE]: Found {0} system folders for {1}", sysFolders.Length, principalID);
195 195
196 return sysFolders; 196 return sysFolders;
197 } 197 }
198 198
@@ -234,7 +234,7 @@ namespace OpenSim.Services.InventoryService
234 break; 234 break;
235 } 235 }
236 } 236 }
237 237
238 if (root == null) // oops 238 if (root == null) // oops
239 root = folders[0]; 239 root = folders[0];
240 240
@@ -255,7 +255,7 @@ namespace OpenSim.Services.InventoryService
255 255
256 return null; 256 return null;
257 } 257 }
258 258
259 return GetSystemFolderForType(rootFolder, type); 259 return GetSystemFolderForType(rootFolder, type);
260 } 260 }
261 261
@@ -335,11 +335,11 @@ namespace OpenSim.Services.InventoryService
335 335
336 return multiple; 336 return multiple;
337 } 337 }
338 338
339 public virtual List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) 339 public virtual List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
340 { 340 {
341// m_log.DebugFormat("[XINVENTORY]: Fetch items for folder {0}", folderID); 341// m_log.DebugFormat("[XINVENTORY]: Fetch items for folder {0}", folderID);
342 342
343 // Since we probably don't get a valid principal here, either ... 343 // Since we probably don't get a valid principal here, either ...
344 // 344 //
345 List<InventoryItemBase> invItems = new List<InventoryItemBase>(); 345 List<InventoryItemBase> invItems = new List<InventoryItemBase>();
@@ -386,7 +386,7 @@ namespace OpenSim.Services.InventoryService
386 m_log.WarnFormat( 386 m_log.WarnFormat(
387 "[XINVENTORY]: System folder of type {0} already exists when tried to add {1} to {2} for {3}", 387 "[XINVENTORY]: System folder of type {0} already exists when tried to add {1} to {2} for {3}",
388 folder.Type, folder.Name, folder.ParentID, folder.Owner); 388 folder.Type, folder.Name, folder.ParentID, folder.Owner);
389 389
390 return false; 390 return false;
391 } 391 }
392 } 392 }
@@ -498,7 +498,7 @@ namespace OpenSim.Services.InventoryService
498 { 498 {
499// m_log.DebugFormat( 499// m_log.DebugFormat(
500// "[XINVENTORY SERVICE]: Adding item {0} {1} to folder {2} for {3}", item.Name, item.ID, item.Folder, item.Owner); 500// "[XINVENTORY SERVICE]: Adding item {0} {1} to folder {2} for {3}", item.Name, item.ID, item.Folder, item.Owner);
501 501
502 return m_Database.StoreItem(ConvertFromOpenSim(item)); 502 return m_Database.StoreItem(ConvertFromOpenSim(item));
503 } 503 }
504 504
@@ -516,27 +516,27 @@ namespace OpenSim.Services.InventoryService
516 if (retrievedItem == null) 516 if (retrievedItem == null)
517 { 517 {
518 m_log.WarnFormat( 518 m_log.WarnFormat(
519 "[XINVENTORY SERVICE]: Tried to update item {0} {1}, owner {2} but no existing item found.", 519 "[XINVENTORY SERVICE]: Tried to update item {0} {1}, owner {2} but no existing item found.",
520 item.Name, item.ID, item.Owner); 520 item.Name, item.ID, item.Owner);
521 521
522 return false; 522 return false;
523 } 523 }
524 524
525 // Do not allow invariants to change. Changes to folder ID occur in MoveItems() 525 // Do not allow invariants to change. Changes to folder ID occur in MoveItems()
526 if (retrievedItem.InvType != item.InvType 526 if (retrievedItem.InvType != item.InvType
527 || retrievedItem.AssetType != item.AssetType 527 || retrievedItem.AssetType != item.AssetType
528 || retrievedItem.Folder != item.Folder 528 || retrievedItem.Folder != item.Folder
529 || retrievedItem.CreatorIdentification != item.CreatorIdentification 529 || retrievedItem.CreatorIdentification != item.CreatorIdentification
530 || retrievedItem.Owner != item.Owner) 530 || retrievedItem.Owner != item.Owner)
531 { 531 {
532 m_log.WarnFormat( 532 m_log.WarnFormat(
533 "[XINVENTORY SERVICE]: Caller to UpdateItem() for {0} {1} tried to alter property(s) that should be invariant, (InvType, AssetType, Folder, CreatorIdentification, Owner), existing ({2}, {3}, {4}, {5}, {6}), update ({7}, {8}, {9}, {10}, {11})", 533 "[XINVENTORY SERVICE]: Caller to UpdateItem() for {0} {1} tried to alter property(s) that should be invariant, (InvType, AssetType, Folder, CreatorIdentification, Owner), existing ({2}, {3}, {4}, {5}, {6}), update ({7}, {8}, {9}, {10}, {11})",
534 retrievedItem.Name, 534 retrievedItem.Name,
535 retrievedItem.ID, 535 retrievedItem.ID,
536 retrievedItem.InvType, 536 retrievedItem.InvType,
537 retrievedItem.AssetType, 537 retrievedItem.AssetType,
538 retrievedItem.Folder, 538 retrievedItem.Folder,
539 retrievedItem.CreatorIdentification, 539 retrievedItem.CreatorIdentification,
540 retrievedItem.Owner, 540 retrievedItem.Owner,
541 item.InvType, 541 item.InvType,
542 item.AssetType, 542 item.AssetType,
@@ -639,7 +639,7 @@ namespace OpenSim.Services.InventoryService
639 return new List<InventoryItemBase>(); 639 return new List<InventoryItemBase>();
640 640
641 List<InventoryItemBase> ret = new List<InventoryItemBase>(); 641 List<InventoryItemBase> ret = new List<InventoryItemBase>();
642 642
643 foreach (XInventoryItem x in items) 643 foreach (XInventoryItem x in items)
644 ret.Add(ConvertToOpenSim(x)); 644 ret.Add(ConvertToOpenSim(x));
645 645