2 files changed, 134 insertions, 134 deletions

diff --git a/OpenSim/Data/NHibernate/ColorUserType.cs b/OpenSim/Data/NHibernate/ColorUserType.cs
index 4676585..1ebd07c 100644
--- a/OpenSim/Data/NHibernate/ColorUserType.cs
+++ b/OpenSim/Data/NHibernate/ColorUserType.cs
@@ -1,106 +1,106 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSim Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * 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

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using System;

-using System.Data;

-using OpenMetaverse;

-using OpenSim.Framework;

-using NHibernate;

-using NHibernate.SqlTypes;

-using NHibernate.UserTypes;

-using System.Drawing;

-

-namespace OpenSim.Data.NHibernate

-{

-    [Serializable]

-    public class ColorUserType : IUserType

-    {

-        public object Assemble(object cached, object owner)

-        {

-            return cached;

-        }

-

-        bool IUserType.Equals(object color1, object color2)

-        {

-            return color1.Equals(color2);

-        }

-

-        public object DeepCopy(object color)

-        {

-            return color;

-        }

-

-        public object Disassemble(object color)

-        {

-            return color;

-        }

-

-        public int GetHashCode(object color)

-        {

-            return (color == null) ? 0 : color.GetHashCode();

-        }

-

-        public bool IsMutable

-        {

-            get { return false; }

-        }

-

-        public object NullSafeGet(IDataReader rs, string[] names, object owner)

-        {

-            Color color=Color.Empty;

-

-            int ord = rs.GetOrdinal(names[0]);

-            if (!rs.IsDBNull(ord))

-            {

-                color = Color.FromArgb(rs.GetInt32(ord));

-            }

-

-            return color;

-        }

-

-        public void NullSafeSet(IDbCommand cmd, object obj, int index)

-        {

-            Color color = (Color)obj;

-            ((IDataParameter)cmd.Parameters[index]).Value = color.ToArgb();

-        }

-

-        public object Replace(object original, object target, object owner)

-        {

-            return original;

-        }

-

-        public Type ReturnedType

-        {

-            get { return typeof(Color); }

-        }

-

-        public SqlType[] SqlTypes

-        {

-            get { return new SqlType [] { NHibernateUtil.Int32.SqlType }; }

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using NHibernate;
+using NHibernate.SqlTypes;
+using NHibernate.UserTypes;
+using System.Drawing;
+
+namespace OpenSim.Data.NHibernate
+{
+    [Serializable]
+    public class ColorUserType : IUserType
+    {
+        public object Assemble(object cached, object owner)
+        {
+            return cached;
+        }
+
+        bool IUserType.Equals(object color1, object color2)
+        {
+            return color1.Equals(color2);
+        }
+
+        public object DeepCopy(object color)
+        {
+            return color;
+        }
+
+        public object Disassemble(object color)
+        {
+            return color;
+        }
+
+        public int GetHashCode(object color)
+        {
+            return (color == null) ? 0 : color.GetHashCode();
+        }
+
+        public bool IsMutable
+        {
+            get { return false; }
+        }
+
+        public object NullSafeGet(IDataReader rs, string[] names, object owner)
+        {
+            Color color=Color.Empty;
+
+            int ord = rs.GetOrdinal(names[0]);
+            if (!rs.IsDBNull(ord))
+            {
+                color = Color.FromArgb(rs.GetInt32(ord));
+            }
+
+            return color;
+        }
+
+        public void NullSafeSet(IDbCommand cmd, object obj, int index)
+        {
+            Color color = (Color)obj;
+            ((IDataParameter)cmd.Parameters[index]).Value = color.ToArgb();
+        }
+
+        public object Replace(object original, object target, object owner)
+        {
+            return original;
+        }
+
+        public Type ReturnedType
+        {
+            get { return typeof(Color); }
+        }
+
+        public SqlType[] SqlTypes
+        {
+            get { return new SqlType [] { NHibernateUtil.Int32.SqlType }; }
+        }
+    }
+}
diff --git a/OpenSim/Data/NHibernate/UserFriend.cs b/OpenSim/Data/NHibernate/UserFriend.cs
index c16b3c8..e030a3d 100644
--- a/OpenSim/Data/NHibernate/UserFriend.cs
+++ b/OpenSim/Data/NHibernate/UserFriend.cs
@@ -1,28 +1,28 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using OpenMetaverse;

-

-namespace OpenSim.Data.NHibernate

-{

-    public class UserFriend

-    {

-        public UserFriend()

-        {

-        }

-

-        public UserFriend(UUID userFriendID, UUID ownerID, UUID friendID, uint friendPermissions)

-        {

-            this.UserFriendID = userFriendID;

-            this.OwnerID = ownerID;

-            this.FriendID = friendID;

-            this.FriendPermissions = friendPermissions;

-        }

-

-        public UUID UserFriendID { get; set; }

-        public UUID OwnerID { get; set; }

-        public UUID FriendID { get; set; }

-        public uint FriendPermissions { get; set; }

-

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenMetaverse;
+
+namespace OpenSim.Data.NHibernate
+{
+    public class UserFriend
+    {
+        public UserFriend()
+        {
+        }
+
+        public UserFriend(UUID userFriendID, UUID ownerID, UUID friendID, uint friendPermissions)
+        {
+            this.UserFriendID = userFriendID;
+            this.OwnerID = ownerID;
+            this.FriendID = friendID;
+            this.FriendPermissions = friendPermissions;
+        }
+
+        public UUID UserFriendID { get; set; }
+        public UUID OwnerID { get; set; }
+        public UUID FriendID { get; set; }
+        public uint FriendPermissions { get; set; }
+
+    }
+}