changed to native line ending encoding

3 files changed, 235 insertions, 235 deletions

diff --git a/OpenSim/Framework/Communications/caches/CachedUserInfo.cs b/OpenSim/Framework/Communications/caches/CachedUserInfo.cs
index 1c779e9..b8d8847 100644
--- a/OpenSim/Framework/Communications/caches/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/caches/CachedUserInfo.cs
@@ -1,77 +1,77 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using OpenSim.Framework.Data;

-using libsecondlife;

-

-namespace OpenSim.Framework.Communications.Caches

-{

-    public class CachedUserInfo

-    {

-        public UserProfileData UserProfile;

-        //public Dictionary<LLUUID, InventoryFolder> Folders = new Dictionary<LLUUID, InventoryFolder>();

-        public InventoryFolder RootFolder;

-

-        public CachedUserInfo()

-        {

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="userID"></param>

-        /// <param name="folderInfo"></param>

-        public void FolderReceive(LLUUID userID, InventoryFolder folderInfo)

-        {

-            if (userID == UserProfile.UUID)

-            {

-                if (this.RootFolder == null)

-                {

-                    if (folderInfo.parentID == LLUUID.Zero)

-                    {

-                        this.RootFolder = folderInfo;

-                    }

-                }

-                else

-                {

-                    if (this.RootFolder.folderID == folderInfo.parentID)

-                    {

-                        this.RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);

-                    }

-                    else

-                    {

-                        InventoryFolder pFolder = this.RootFolder.HasSubFolder(folderInfo.parentID);

-                        if (pFolder != null)

-                        {

-                            pFolder.SubFolders.Add(folderInfo.folderID, folderInfo);

-                        }

-                    }

-                }

-            }

-        }

-

-        public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)

-        {

-            if (userID == UserProfile.UUID)

-            {

-                if (this.RootFolder != null)

-                {

-                    if (itemInfo.parentFolderID == this.RootFolder.folderID)

-                    {

-                        this.RootFolder.Items.Add(itemInfo.inventoryID, itemInfo);

-                    }

-                    else

-                    {

-                        InventoryFolder pFolder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID);

-                        if (pFolder != null)

-                        {

-                            pFolder.Items.Add(itemInfo.inventoryID, itemInfo);

-                        }

-                    }

-                }

-

-            }

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Data;
+using libsecondlife;
+
+namespace OpenSim.Framework.Communications.Caches
+{
+    public class CachedUserInfo
+    {
+        public UserProfileData UserProfile;
+        //public Dictionary<LLUUID, InventoryFolder> Folders = new Dictionary<LLUUID, InventoryFolder>();
+        public InventoryFolder RootFolder;
+
+        public CachedUserInfo()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="folderInfo"></param>
+        public void FolderReceive(LLUUID userID, InventoryFolder folderInfo)
+        {
+            if (userID == UserProfile.UUID)
+            {
+                if (this.RootFolder == null)
+                {
+                    if (folderInfo.parentID == LLUUID.Zero)
+                    {
+                        this.RootFolder = folderInfo;
+                    }
+                }
+                else
+                {
+                    if (this.RootFolder.folderID == folderInfo.parentID)
+                    {
+                        this.RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
+                    }
+                    else
+                    {
+                        InventoryFolder pFolder = this.RootFolder.HasSubFolder(folderInfo.parentID);
+                        if (pFolder != null)
+                        {
+                            pFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
+                        }
+                    }
+                }
+            }
+        }
+
+        public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)
+        {
+            if (userID == UserProfile.UUID)
+            {
+                if (this.RootFolder != null)
+                {
+                    if (itemInfo.parentFolderID == this.RootFolder.folderID)
+                    {
+                        this.RootFolder.Items.Add(itemInfo.inventoryID, itemInfo);
+                    }
+                    else
+                    {
+                        InventoryFolder pFolder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID);
+                        if (pFolder != null)
+                        {
+                            pFolder.Items.Add(itemInfo.inventoryID, itemInfo);
+                        }
+                    }
+                }
+
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/caches/InventoryFolder.cs b/OpenSim/Framework/Communications/caches/InventoryFolder.cs
index eaddf19..af38b12 100644
--- a/OpenSim/Framework/Communications/caches/InventoryFolder.cs
+++ b/OpenSim/Framework/Communications/caches/InventoryFolder.cs
@@ -1,51 +1,51 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-using OpenSim.Framework.Data;

-

-namespace OpenSim.Framework.Communications.Caches

-{

-    public class InventoryFolder : InventoryFolderBase

-    {

-        public Dictionary<LLUUID, InventoryFolder> SubFolders = new Dictionary<LLUUID, InventoryFolder>();

-        public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>();

-

-        public InventoryFolder()

-        {

-        }

-

-        public InventoryFolder HasSubFolder(LLUUID folderID)

-        {

-            InventoryFolder returnFolder = null;

-            if (this.SubFolders.ContainsKey(folderID))

-            {

-                returnFolder = this.SubFolders[folderID];

-            }

-            else

-            {

-                foreach (InventoryFolder folder in this.SubFolders.Values)

-                {

-                   returnFolder = folder.HasSubFolder(folderID);

-                   if (returnFolder != null)

-                   {

-                       break;

-                   }

-                }

-            }

-            return returnFolder;

-        }

-

-        public InventoryFolder CreateNewSubFolder(LLUUID folderID, string folderName, ushort type)

-        {

-            InventoryFolder subFold = new InventoryFolder();

-            subFold.name = folderName;

-            subFold.folderID = folderID;

-            subFold.type = type;

-            subFold.parentID = this.folderID;

-            subFold.agentID = this.agentID;

-            this.SubFolders.Add(subFold.folderID, subFold);

-            return subFold;

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework.Data;
+
+namespace OpenSim.Framework.Communications.Caches
+{
+    public class InventoryFolder : InventoryFolderBase
+    {
+        public Dictionary<LLUUID, InventoryFolder> SubFolders = new Dictionary<LLUUID, InventoryFolder>();
+        public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>();
+
+        public InventoryFolder()
+        {
+        }
+
+        public InventoryFolder HasSubFolder(LLUUID folderID)
+        {
+            InventoryFolder returnFolder = null;
+            if (this.SubFolders.ContainsKey(folderID))
+            {
+                returnFolder = this.SubFolders[folderID];
+            }
+            else
+            {
+                foreach (InventoryFolder folder in this.SubFolders.Values)
+                {
+                   returnFolder = folder.HasSubFolder(folderID);
+                   if (returnFolder != null)
+                   {
+                       break;
+                   }
+                }
+            }
+            return returnFolder;
+        }
+
+        public InventoryFolder CreateNewSubFolder(LLUUID folderID, string folderName, ushort type)
+        {
+            InventoryFolder subFold = new InventoryFolder();
+            subFold.name = folderName;
+            subFold.folderID = folderID;
+            subFold.type = type;
+            subFold.parentID = this.folderID;
+            subFold.agentID = this.agentID;
+            this.SubFolders.Add(subFold.folderID, subFold);
+            return subFold;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/caches/UserProfileCache.cs b/OpenSim/Framework/Communications/caches/UserProfileCache.cs
index 0ee63ba..f651b8a 100644
--- a/OpenSim/Framework/Communications/caches/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/caches/UserProfileCache.cs
@@ -1,107 +1,107 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-using OpenSim.Framework.Data;

-using OpenSim.Framework.Communications;

-

-namespace OpenSim.Framework.Communications.Caches

-{

-    public class UserProfileCache

-    {

-        public Dictionary<LLUUID, CachedUserInfo> UserProfiles = new Dictionary<LLUUID, CachedUserInfo>();

-

-        private CommunicationsManager m_parent;

-

-        public UserProfileCache(CommunicationsManager parent)

-        {

-            m_parent = parent;

-        }

-

-        /// <summary>

-        /// A new user has moved into a region in this instance

-        /// so get info from servers

-        /// </summary>

-        /// <param name="userID"></param>

-        public void AddNewUser(LLUUID userID)

-        {

-            if (!this.UserProfiles.ContainsKey(userID))

-            {

-                CachedUserInfo userInfo = new CachedUserInfo();

-                userInfo.UserProfile = this.RequestUserProfileForUser(userID);

-                this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);

-                if (userInfo.UserProfile != null)

-                {

-                    this.UserProfiles.Add(userID, userInfo);

-                }

-                else

-                {

-                    //no profile for this user, what do we do now?

-                }

-            }

-            else

-            {

-                //already have a cached profile for this user

-                //we should make sure its upto date with the user server version

-            }

-        }

-

-        /// <summary>

-        /// A new user has moved into a region in this instance

-        /// so get info from servers

-        /// </summary>

-        /// <param name="firstName"></param>

-        /// <param name="lastName"></param>

-        public void AddNewUser(string firstName, string lastName)

-        {

-            

-        }

-

-        /// <summary>

-        /// A user has left this instance 

-        /// so make sure servers have been updated

-        /// Then remove cached info

-        /// </summary>

-        /// <param name="userID"></param>

-        public void UserLogOut(LLUUID userID)

-        {

-

-        }

-

-        /// <summary>

-        /// Request the user profile from User server

-        /// </summary>

-        /// <param name="userID"></param>

-        private UserProfileData RequestUserProfileForUser(LLUUID userID)

-        {

-            return this.m_parent.UserServer.GetUserProfile(userID);

-        }

-

-        /// <summary>

-        /// Request Iventory Info from Inventory server

-        /// </summary>

-        /// <param name="userID"></param>

-        private void RequestInventoryForUser(LLUUID userID)

-        {

-

-        }

-

-        /// <summary>

-        /// Make sure UserProfile is updated on user server

-        /// </summary>

-        /// <param name="userID"></param>

-        private void UpdateUserProfileToServer(LLUUID userID)

-        {

-

-        }

-

-        /// <summary>

-        /// Update Inventory data to Inventory server

-        /// </summary>

-        /// <param name="userID"></param>

-        private void UpdateInventoryToServer(LLUUID userID)

-        {

-

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Communications;
+
+namespace OpenSim.Framework.Communications.Caches
+{
+    public class UserProfileCache
+    {
+        public Dictionary<LLUUID, CachedUserInfo> UserProfiles = new Dictionary<LLUUID, CachedUserInfo>();
+
+        private CommunicationsManager m_parent;
+
+        public UserProfileCache(CommunicationsManager parent)
+        {
+            m_parent = parent;
+        }
+
+        /// <summary>
+        /// A new user has moved into a region in this instance
+        /// so get info from servers
+        /// </summary>
+        /// <param name="userID"></param>
+        public void AddNewUser(LLUUID userID)
+        {
+            if (!this.UserProfiles.ContainsKey(userID))
+            {
+                CachedUserInfo userInfo = new CachedUserInfo();
+                userInfo.UserProfile = this.RequestUserProfileForUser(userID);
+                this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
+                if (userInfo.UserProfile != null)
+                {
+                    this.UserProfiles.Add(userID, userInfo);
+                }
+                else
+                {
+                    //no profile for this user, what do we do now?
+                }
+            }
+            else
+            {
+                //already have a cached profile for this user
+                //we should make sure its upto date with the user server version
+            }
+        }
+
+        /// <summary>
+        /// A new user has moved into a region in this instance
+        /// so get info from servers
+        /// </summary>
+        /// <param name="firstName"></param>
+        /// <param name="lastName"></param>
+        public void AddNewUser(string firstName, string lastName)
+        {
+            
+        }
+
+        /// <summary>
+        /// A user has left this instance 
+        /// so make sure servers have been updated
+        /// Then remove cached info
+        /// </summary>
+        /// <param name="userID"></param>
+        public void UserLogOut(LLUUID userID)
+        {
+
+        }
+
+        /// <summary>
+        /// Request the user profile from User server
+        /// </summary>
+        /// <param name="userID"></param>
+        private UserProfileData RequestUserProfileForUser(LLUUID userID)
+        {
+            return this.m_parent.UserServer.GetUserProfile(userID);
+        }
+
+        /// <summary>
+        /// Request Iventory Info from Inventory server
+        /// </summary>
+        /// <param name="userID"></param>
+        private void RequestInventoryForUser(LLUUID userID)
+        {
+
+        }
+
+        /// <summary>
+        /// Make sure UserProfile is updated on user server
+        /// </summary>
+        /// <param name="userID"></param>
+        private void UpdateUserProfileToServer(LLUUID userID)
+        {
+
+        }
+
+        /// <summary>
+        /// Update Inventory data to Inventory server
+        /// </summary>
+        /// <param name="userID"></param>
+        private void UpdateInventoryToServer(LLUUID userID)
+        {
+
+        }
+    }
+}