aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorHomer Horwitz2009-01-12 19:24:20 +0000
committerHomer Horwitz2009-01-12 19:24:20 +0000
commit7caf1a4abf1d9ead500714c361b176eddd3921ff (patch)
treec0cab324ef8d897a4642ef059cab4d033e3ff402 /OpenSim/Data
parent* Extend PacketHandlerTest to fire in a packet. (diff)
downloadopensim-SC_OLD-7caf1a4abf1d9ead500714c361b176eddd3921ff.zip
opensim-SC_OLD-7caf1a4abf1d9ead500714c361b176eddd3921ff.tar.gz
opensim-SC_OLD-7caf1a4abf1d9ead500714c361b176eddd3921ff.tar.bz2
opensim-SC_OLD-7caf1a4abf1d9ead500714c361b176eddd3921ff.tar.xz
Fixed some svn properties
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/NHibernate/ColorUserType.cs212
-rw-r--r--OpenSim/Data/NHibernate/UserFriend.cs56
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 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.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
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using NHibernate; 32using NHibernate;
33using NHibernate.SqlTypes; 33using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 34using NHibernate.UserTypes;
35using System.Drawing; 35using System.Drawing;
36 36
37namespace OpenSim.Data.NHibernate 37namespace OpenSim.Data.NHibernate
38{ 38{
39 [Serializable] 39 [Serializable]
40 public class ColorUserType : IUserType 40 public class ColorUserType : IUserType
41 { 41 {
42 public object Assemble(object cached, object owner) 42 public object Assemble(object cached, object owner)
43 { 43 {
44 return cached; 44 return cached;
45 } 45 }
46 46
47 bool IUserType.Equals(object color1, object color2) 47 bool IUserType.Equals(object color1, object color2)
48 { 48 {
49 return color1.Equals(color2); 49 return color1.Equals(color2);
50 } 50 }
51 51
52 public object DeepCopy(object color) 52 public object DeepCopy(object color)
53 { 53 {
54 return color; 54 return color;
55 } 55 }
56 56
57 public object Disassemble(object color) 57 public object Disassemble(object color)
58 { 58 {
59 return color; 59 return color;
60 } 60 }
61 61
62 public int GetHashCode(object color) 62 public int GetHashCode(object color)
63 { 63 {
64 return (color == null) ? 0 : color.GetHashCode(); 64 return (color == null) ? 0 : color.GetHashCode();
65 } 65 }
66 66
67 public bool IsMutable 67 public bool IsMutable
68 { 68 {
69 get { return false; } 69 get { return false; }
70 } 70 }
71 71
72 public object NullSafeGet(IDataReader rs, string[] names, object owner) 72 public object NullSafeGet(IDataReader rs, string[] names, object owner)
73 { 73 {
74 Color color=Color.Empty; 74 Color color=Color.Empty;
75 75
76 int ord = rs.GetOrdinal(names[0]); 76 int ord = rs.GetOrdinal(names[0]);
77 if (!rs.IsDBNull(ord)) 77 if (!rs.IsDBNull(ord))
78 { 78 {
79 color = Color.FromArgb(rs.GetInt32(ord)); 79 color = Color.FromArgb(rs.GetInt32(ord));
80 } 80 }
81 81
82 return color; 82 return color;
83 } 83 }
84 84
85 public void NullSafeSet(IDbCommand cmd, object obj, int index) 85 public void NullSafeSet(IDbCommand cmd, object obj, int index)
86 { 86 {
87 Color color = (Color)obj; 87 Color color = (Color)obj;
88 ((IDataParameter)cmd.Parameters[index]).Value = color.ToArgb(); 88 ((IDataParameter)cmd.Parameters[index]).Value = color.ToArgb();
89 } 89 }
90 90
91 public object Replace(object original, object target, object owner) 91 public object Replace(object original, object target, object owner)
92 { 92 {
93 return original; 93 return original;
94 } 94 }
95 95
96 public Type ReturnedType 96 public Type ReturnedType
97 { 97 {
98 get { return typeof(Color); } 98 get { return typeof(Color); }
99 } 99 }
100 100
101 public SqlType[] SqlTypes 101 public SqlType[] SqlTypes
102 { 102 {
103 get { return new SqlType [] { NHibernateUtil.Int32.SqlType }; } 103 get { return new SqlType [] { NHibernateUtil.Int32.SqlType }; }
104 } 104 }
105 } 105 }
106} 106}
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 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenMetaverse; 4using OpenMetaverse;
5 5
6namespace OpenSim.Data.NHibernate 6namespace OpenSim.Data.NHibernate
7{ 7{
8 public class UserFriend 8 public class UserFriend
9 { 9 {
10 public UserFriend() 10 public UserFriend()
11 { 11 {
12 } 12 }
13 13
14 public UserFriend(UUID userFriendID, UUID ownerID, UUID friendID, uint friendPermissions) 14 public UserFriend(UUID userFriendID, UUID ownerID, UUID friendID, uint friendPermissions)
15 { 15 {
16 this.UserFriendID = userFriendID; 16 this.UserFriendID = userFriendID;
17 this.OwnerID = ownerID; 17 this.OwnerID = ownerID;
18 this.FriendID = friendID; 18 this.FriendID = friendID;
19 this.FriendPermissions = friendPermissions; 19 this.FriendPermissions = friendPermissions;
20 } 20 }
21 21
22 public UUID UserFriendID { get; set; } 22 public UUID UserFriendID { get; set; }
23 public UUID OwnerID { get; set; } 23 public UUID OwnerID { get; set; }
24 public UUID FriendID { get; set; } 24 public UUID FriendID { get; set; }
25 public uint FriendPermissions { get; set; } 25 public uint FriendPermissions { get; set; }
26 26
27 } 27 }
28} 28}