1 files changed, 94 insertions, 94 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 2660df3..d850305 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -1,94 +1,94 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-using System.IO;
+using System.IO;
-using libsecondlife;
+using libsecondlife;
-using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
+using OpenSim.Framework.Types;
-using OpenSim.Framework.Data;
+using OpenSim.Framework.Data;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Utilities;
-namespace OpenSim.Framework.Communications.Caches
+namespace OpenSim.Framework.Communications.Caches
-{
+{
-    public class CachedUserInfo
+    public class CachedUserInfo
-    {
+    {
-        // Fields
+        // Fields
-        public InventoryFolder RootFolder;
+        public InventoryFolder RootFolder;
-        public UserProfileData UserProfile;
+        public UserProfileData UserProfile;
-        // Methods
+        // Methods
-        public void FolderReceive(LLUUID userID, InventoryFolder folderInfo)
+        public void FolderReceive(LLUUID userID, InventoryFolder folderInfo)
-        {
+        {
-            if (userID == this.UserProfile.UUID)
+            if (userID == this.UserProfile.UUID)
-            {
+            {
-                if (this.RootFolder == null)
+                if (this.RootFolder == null)
-                {
+                {
-                    if (folderInfo.parentID == LLUUID.Zero)
+                    if (folderInfo.parentID == LLUUID.Zero)
-                    {
+                    {
-                        this.RootFolder = folderInfo;
+                        this.RootFolder = folderInfo;
-                    }
+                    }
-                }
+                }
-                else if (this.RootFolder.folderID == folderInfo.parentID)
+                else if (this.RootFolder.folderID == folderInfo.parentID)
-                {
+                {
-                    this.RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
+                    this.RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
-                }
+                }
-                else
+                else
-                {
+                {
-                    InventoryFolder folder = this.RootFolder.HasSubFolder(folderInfo.parentID);
+                    InventoryFolder folder = this.RootFolder.HasSubFolder(folderInfo.parentID);
-                    if (folder != null)
+                    if (folder != null)
-                    {
+                    {
-                        folder.SubFolders.Add(folderInfo.folderID, folderInfo);
+                        folder.SubFolders.Add(folderInfo.folderID, folderInfo);
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)
+        public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)
-        {
+        {
-            if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
+            if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
-            {
+            {
-                if (itemInfo.parentFolderID == this.RootFolder.folderID)
+                if (itemInfo.parentFolderID == this.RootFolder.folderID)
-                {
+                {
-                    this.RootFolder.Items.Add(itemInfo.inventoryID, itemInfo);
+                    this.RootFolder.Items.Add(itemInfo.inventoryID, itemInfo);
-                }
+                }
-                else
+                else
-                {
+                {
-                    InventoryFolder folder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID);
+                    InventoryFolder folder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID);
-                    if (folder != null)
+                    if (folder != null)
-                    {
+                    {
-                        folder.Items.Add(itemInfo.inventoryID, itemInfo);
+                        folder.Items.Add(itemInfo.inventoryID, itemInfo);
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 2660df3..d850305 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -1,94 +1,94 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/	2	* Copyright (c) Contributors, http://www.openmetaverse.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28	using System;	28	using System;
29	using System.Collections;	29	using System.Collections;
30	using System.Collections.Generic;	30	using System.Collections.Generic;
31	using System.Text;	31	using System.Text;
32	using System.IO;	32	using System.IO;
33	using libsecondlife;	33	using libsecondlife;
34	using OpenSim.Framework.Interfaces;	34	using OpenSim.Framework.Interfaces;
35	using OpenSim.Framework.Types;	35	using OpenSim.Framework.Types;
36	using OpenSim.Framework.Data;	36	using OpenSim.Framework.Data;
37	using OpenSim.Framework.Utilities;	37	using OpenSim.Framework.Utilities;
38		38
39	namespace OpenSim.Framework.Communications.Caches	39	namespace OpenSim.Framework.Communications.Caches
40	{	40	{
41	public class CachedUserInfo	41	public class CachedUserInfo
42	{	42	{
43	// Fields	43	// Fields
44	public InventoryFolder RootFolder;	44	public InventoryFolder RootFolder;
45	public UserProfileData UserProfile;	45	public UserProfileData UserProfile;
46		46
47	// Methods	47	// Methods
48	public void FolderReceive(LLUUID userID, InventoryFolder folderInfo)	48	public void FolderReceive(LLUUID userID, InventoryFolder folderInfo)
49	{	49	{
50	if (userID == this.UserProfile.UUID)	50	if (userID == this.UserProfile.UUID)
51	{	51	{
52	if (this.RootFolder == null)	52	if (this.RootFolder == null)
53	{	53	{
54	if (folderInfo.parentID == LLUUID.Zero)	54	if (folderInfo.parentID == LLUUID.Zero)
55	{	55	{
56	this.RootFolder = folderInfo;	56	this.RootFolder = folderInfo;
57	}	57	}
58	}	58	}
59	else if (this.RootFolder.folderID == folderInfo.parentID)	59	else if (this.RootFolder.folderID == folderInfo.parentID)
60	{	60	{
61	this.RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);	61	this.RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
62	}	62	}
63	else	63	else
64	{	64	{
65	InventoryFolder folder = this.RootFolder.HasSubFolder(folderInfo.parentID);	65	InventoryFolder folder = this.RootFolder.HasSubFolder(folderInfo.parentID);
66	if (folder != null)	66	if (folder != null)
67	{	67	{
68	folder.SubFolders.Add(folderInfo.folderID, folderInfo);	68	folder.SubFolders.Add(folderInfo.folderID, folderInfo);
69	}	69	}
70	}	70	}
71	}	71	}
72	}	72	}
73		73
74	public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)	74	public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)
75	{	75	{
76	if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))	76	if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
77	{	77	{
78	if (itemInfo.parentFolderID == this.RootFolder.folderID)	78	if (itemInfo.parentFolderID == this.RootFolder.folderID)
79	{	79	{
80	this.RootFolder.Items.Add(itemInfo.inventoryID, itemInfo);	80	this.RootFolder.Items.Add(itemInfo.inventoryID, itemInfo);
81	}	81	}
82	else	82	else
83	{	83	{
84	InventoryFolder folder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID);	84	InventoryFolder folder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID);
85	if (folder != null)	85	if (folder != null)
86	{	86	{
87	folder.Items.Add(itemInfo.inventoryID, itemInfo);	87	folder.Items.Add(itemInfo.inventoryID, itemInfo);
88	}	88	}
89	}	89	}
90	}	90	}
91	}	91	}
92	}	92	}
93	}	93	}
94		94