aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs6
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs12
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs6
-rw-r--r--OpenSim/Data/UserDataBase.cs4
-rw-r--r--OpenSim/Framework/Communications/IUserService.cs4
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs6
-rw-r--r--OpenSim/Framework/IUserData.cs4
-rw-r--r--OpenSim/Framework/UserAppearance.cs228
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs6
10 files changed, 27 insertions, 255 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index d54af82..4904bfe 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -747,12 +747,12 @@ namespace OpenSim.Data.MSSQL
747 747
748 /// Appearance 748 /// Appearance
749 /// TODO: stubs for now to get us to a compiling state gently 749 /// TODO: stubs for now to get us to a compiling state gently
750 override public UserAppearance GetUserAppearance(LLUUID user) 750 override public AvatarAppearance GetUserAppearance(LLUUID user)
751 { 751 {
752 return new UserAppearance(); 752 return new AvatarAppearance();
753 } 753 }
754 754
755 override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) 755 override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
756 { 756 {
757 return; 757 return;
758 } 758 }
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index ab34f15..622a618 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -630,12 +630,12 @@ namespace OpenSim.Data.MySQL
630 630
631 /// Appearance 631 /// Appearance
632 /// TODO: stubs for now to get us to a compiling state gently 632 /// TODO: stubs for now to get us to a compiling state gently
633 override public UserAppearance GetUserAppearance(LLUUID user) 633 override public AvatarAppearance GetUserAppearance(LLUUID user)
634 { 634 {
635 return new UserAppearance(); 635 return new AvatarAppearance();
636 } 636 }
637 637
638 override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) 638 override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
639 { 639 {
640 return; 640 return;
641 } 641 }
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 43d8c32..81af4d4 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -306,29 +306,29 @@ namespace OpenSim.Data.NHibernate
306 306
307 /// Appearance 307 /// Appearance
308 /// TODO: stubs for now to get us to a compiling state gently 308 /// TODO: stubs for now to get us to a compiling state gently
309 override public UserAppearance GetUserAppearance(LLUUID user) 309 override public AvatarAppearance GetUserAppearance(LLUUID user)
310 { 310 {
311 UserAppearance appearance; 311 AvatarAppearance appearance;
312 // TODO: I'm sure I'll have to do something silly here 312 // TODO: I'm sure I'll have to do something silly here
313 using (ISession session = factory.OpenSession()) 313 using (ISession session = factory.OpenSession())
314 { 314 {
315 appearance = session.Load(typeof(UserAppearance), user) as UserAppearance; 315 appearance = session.Load(typeof(AvatarAppearance), user) as AvatarAppearance;
316 } 316 }
317 return appearance; 317 return appearance;
318 } 318 }
319 319
320 private bool ExistsAppearance(LLUUID uuid) 320 private bool ExistsAppearance(LLUUID uuid)
321 { 321 {
322 UserAppearance appearance; 322 AvatarAppearance appearance;
323 using (ISession session = factory.OpenSession()) 323 using (ISession session = factory.OpenSession())
324 { 324 {
325 appearance = session.Load(typeof(UserAppearance), uuid) as UserAppearance; 325 appearance = session.Load(typeof(AvatarAppearance), uuid) as AvatarAppearance;
326 } 326 }
327 return (appearance == null) ? false : true; 327 return (appearance == null) ? false : true;
328 } 328 }
329 329
330 330
331 override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) 331 override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
332 { 332 {
333 bool exists = ExistsAppearance(user); 333 bool exists = ExistsAppearance(user);
334 using (ISession session = factory.OpenSession()) 334 using (ISession session = factory.OpenSession())
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index aa7a849..e80a0a9 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -480,12 +480,12 @@ namespace OpenSim.Data.SQLite
480 480
481 /// Appearance 481 /// Appearance
482 /// TODO: stubs for now to get us to a compiling state gently 482 /// TODO: stubs for now to get us to a compiling state gently
483 override public UserAppearance GetUserAppearance(LLUUID user) 483 override public AvatarAppearance GetUserAppearance(LLUUID user)
484 { 484 {
485 return new UserAppearance(); 485 return new AvatarAppearance();
486 } 486 }
487 487
488 override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) 488 override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
489 { 489 {
490 return; 490 return;
491 } 491 }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 2ddeccf..fb784dc 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Data
53 public abstract string Name {get;} 53 public abstract string Name {get;}
54 public abstract void Initialise(string connect); 54 public abstract void Initialise(string connect);
55 public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); 55 public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
56 public abstract UserAppearance GetUserAppearance(LLUUID user); 56 public abstract AvatarAppearance GetUserAppearance(LLUUID user);
57 public abstract void UpdateUserAppearance(LLUUID user, UserAppearance appearance); 57 public abstract void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
58 public abstract void AddAttachment(LLUUID user, LLUUID item); 58 public abstract void AddAttachment(LLUUID user, LLUUID item);
59 public abstract void RemoveAttachment(LLUUID user, LLUUID item); 59 public abstract void RemoveAttachment(LLUUID user, LLUUID item);
60 public abstract List<LLUUID> GetAttachments(LLUUID user); 60 public abstract List<LLUUID> GetAttachments(LLUUID user);
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index f8d5541..7d71d02 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -111,9 +111,9 @@ namespace OpenSim.Framework.Communications
111 111
112 /// <summary> 112 /// <summary>
113 /// Get's the User Appearance 113 /// Get's the User Appearance
114 UserAppearance GetUserAppearance(LLUUID user); 114 AvatarAppearance GetUserAppearance(LLUUID user);
115 115
116 void UpdateUserAppearance(LLUUID user, UserAppearance appearance); 116 void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
117 117
118 void AddAttachment(LLUUID user, LLUUID attach); 118 void AddAttachment(LLUUID user, LLUUID attach);
119 119
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 51a5036..8e0b75c 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -598,7 +598,7 @@ namespace OpenSim.Framework.Communications
598 598
599 /// Appearance 599 /// Appearance
600 /// TODO: stubs for now to get us to a compiling state gently 600 /// TODO: stubs for now to get us to a compiling state gently
601 public UserAppearance GetUserAppearance(LLUUID user) 601 public AvatarAppearance GetUserAppearance(LLUUID user)
602 { 602 {
603 foreach (KeyValuePair<string, IUserData> plugin in _plugins) 603 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
604 { 604 {
@@ -611,10 +611,10 @@ namespace OpenSim.Framework.Communications
611 m_log.InfoFormat("[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user.ToString(), plugin.Key, e.ToString()); 611 m_log.InfoFormat("[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user.ToString(), plugin.Key, e.ToString());
612 } 612 }
613 } 613 }
614 return new UserAppearance(); 614 return new AvatarAppearance();
615 } 615 }
616 616
617 public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) 617 public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
618 { 618 {
619 foreach (KeyValuePair<string, IUserData> plugin in _plugins) 619 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
620 { 620 {
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs
index 1e557d3..be05094 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
@@ -178,9 +178,9 @@ namespace OpenSim.Framework
178 /// <summary> 178 /// <summary>
179 /// Gets the user appearance 179 /// Gets the user appearance
180 /// </summer> 180 /// </summer>
181 UserAppearance GetUserAppearance(LLUUID user); 181 AvatarAppearance GetUserAppearance(LLUUID user);
182 182
183 void UpdateUserAppearance(LLUUID user, UserAppearance appearance); 183 void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
184 184
185 185
186 void AddAttachment(LLUUID user, LLUUID item); 186 void AddAttachment(LLUUID user, LLUUID item);
diff --git a/OpenSim/Framework/UserAppearance.cs b/OpenSim/Framework/UserAppearance.cs
deleted file mode 100644
index cda0513..0000000
--- a/OpenSim/Framework/UserAppearance.cs
+++ /dev/null
@@ -1,228 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
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
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
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using libsecondlife;
29
30namespace OpenSim.Framework
31{
32 /// <summary>
33 /// Information about a particular user known to the userserver
34 /// </summary>
35
36 public class UserAppearance
37 {
38 // these are guessed at by the list here -
39 // http://wiki.secondlife.com/wiki/Avatar_Appearance. We'll
40 // correct them over time for when were are wrong.
41 public readonly static int BODY = 0;
42 public readonly static int SKIN = 1;
43 public readonly static int HAIR = 2;
44 public readonly static int EYES = 3;
45 public readonly static int SHIRT = 4;
46 public readonly static int PANTS = 5;
47 public readonly static int SHOES = 6;
48 public readonly static int SOCKS = 7;
49 public readonly static int JACKET = 8;
50 public readonly static int GLOVES = 9;
51 public readonly static int UNDERSHIRT = 10;
52 public readonly static int UNDERPANTS = 11;
53 public readonly static int SKIRT = 12;
54
55 private readonly static int MAX_WEARABLES = 13;
56
57 private static LLUUID BODY_ASSET = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
58 private static LLUUID BODY_ITEM = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9");
59 private static LLUUID SKIN_ASSET = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
60 private static LLUUID SKIN_ITEM = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9");
61 private static LLUUID SHIRT_ASSET = new LLUUID("00000000-38f9-1111-024e-222222111110");
62 private static LLUUID SHIRT_ITEM = new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000");
63 private static LLUUID PANTS_ASSET = new LLUUID("00000000-38f9-1111-024e-222222111120");
64 private static LLUUID PANTS_ITEM = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111");
65
66 public readonly static int VISUALPARAM_COUNT = 218;
67
68 private AvatarWearable[] _wearables;
69 private byte[] _visualParams;
70 private byte[] _texture;
71 private LLUUID _user;
72 private int _serial;
73
74 public UserAppearance()
75 {
76 _wearables = new AvatarWearable[MAX_WEARABLES];
77 for (int i = 0; i < MAX_WEARABLES; i++)
78 {
79 // this makes them all null
80 _wearables[i] = new AvatarWearable();
81 }
82 _serial = 0;
83 _user = LLUUID.Zero;
84 _visualParams = new byte[VISUALPARAM_COUNT];
85 }
86
87 public byte[] Texture {
88 get { return _texture; }
89 set { _texture = value; }
90 }
91
92 public byte[] VisualParams {
93 get { return _visualParams; }
94 set { _visualParams = value; }
95 }
96
97 public AvatarWearable[] Wearables {
98 get { return _wearables; }
99 }
100
101 public LLUUID User {
102 get { return _user; }
103 set { _user = value; }
104 }
105
106 public int Serial {
107 get { return _serial; }
108 set { _serial = value; }
109 }
110
111 public LLUUID BodyItem {
112 get { return _wearables[BODY].ItemID; }
113 set { _wearables[BODY].ItemID = value; }
114 }
115 public LLUUID BodyAsset {
116 get { return _wearables[BODY].AssetID; }
117 set { _wearables[BODY].AssetID = value; }
118 }
119 public LLUUID SkinItem {
120 get { return _wearables[SKIN].ItemID; }
121 set { _wearables[SKIN].ItemID = value; }
122 }
123 public LLUUID SkinAsset {
124 get { return _wearables[SKIN].AssetID; }
125 set { _wearables[SKIN].AssetID = value; }
126 }
127 public LLUUID HairItem {
128 get { return _wearables[HAIR].ItemID; }
129 set { _wearables[HAIR].ItemID = value; }
130 }
131 public LLUUID HairAsset {
132 get { return _wearables[HAIR].AssetID; }
133 set { _wearables[HAIR].AssetID = value; }
134 }
135 public LLUUID EyesItem {
136 get { return _wearables[EYES].ItemID; }
137 set { _wearables[EYES].ItemID = value; }
138 }
139 public LLUUID EyesAsset {
140 get { return _wearables[EYES].AssetID; }
141 set { _wearables[EYES].AssetID = value; }
142 }
143 public LLUUID ShirtItem {
144 get { return _wearables[SHIRT].ItemID; }
145 set { _wearables[SHIRT].ItemID = value; }
146 }
147 public LLUUID ShirtAsset {
148 get { return _wearables[SHIRT].AssetID; }
149 set { _wearables[SHIRT].AssetID = value; }
150 }
151 public LLUUID PantsItem {
152 get { return _wearables[PANTS].ItemID; }
153 set { _wearables[PANTS].ItemID = value; }
154 }
155 public LLUUID PantsAsset {
156 get { return _wearables[BODY].AssetID; }
157 set { _wearables[BODY].AssetID = value; }
158 }
159 public LLUUID ShoesItem {
160 get { return _wearables[SHOES].ItemID; }
161 set { _wearables[SHOES].ItemID = value; }
162 }
163 public LLUUID ShoesAsset {
164 get { return _wearables[SHOES].AssetID; }
165 set { _wearables[SHOES].AssetID = value; }
166 }
167 public LLUUID SocksItem {
168 get { return _wearables[SOCKS].ItemID; }
169 set { _wearables[SOCKS].ItemID = value; }
170 }
171 public LLUUID SocksAsset {
172 get { return _wearables[SOCKS].AssetID; }
173 set { _wearables[SOCKS].AssetID = value; }
174 }
175 public LLUUID JacketItem {
176 get { return _wearables[JACKET].ItemID; }
177 set { _wearables[JACKET].ItemID = value; }
178 }
179 public LLUUID JacketAsset {
180 get { return _wearables[JACKET].AssetID; }
181 set { _wearables[JACKET].AssetID = value; }
182 }
183 public LLUUID GlovesItem {
184 get { return _wearables[GLOVES].ItemID; }
185 set { _wearables[GLOVES].ItemID = value; }
186 }
187 public LLUUID GlovesAsset {
188 get { return _wearables[GLOVES].AssetID; }
189 set { _wearables[GLOVES].AssetID = value; }
190 }
191 public LLUUID UnderShirtItem {
192 get { return _wearables[UNDERSHIRT].ItemID; }
193 set { _wearables[UNDERSHIRT].ItemID = value; }
194 }
195 public LLUUID UnderShirtAsset {
196 get { return _wearables[UNDERSHIRT].AssetID; }
197 set { _wearables[UNDERSHIRT].AssetID = value; }
198 }
199 public LLUUID UnderPantsItem {
200 get { return _wearables[UNDERPANTS].ItemID; }
201 set { _wearables[UNDERPANTS].ItemID = value; }
202 }
203 public LLUUID UnderPantsAsset {
204 get { return _wearables[UNDERPANTS].AssetID; }
205 set { _wearables[UNDERPANTS].AssetID = value; }
206 }
207 public LLUUID SkirtItem {
208 get { return _wearables[SKIRT].ItemID; }
209 set { _wearables[SKIRT].ItemID = value; }
210 }
211 public LLUUID SkirtAsset {
212 get { return _wearables[SKIRT].AssetID; }
213 set { _wearables[SKIRT].AssetID = value; }
214 }
215
216 public void SetDefaultWearables()
217 {
218 _wearables[BODY].AssetID = BODY_ASSET;
219 _wearables[BODY].ItemID = BODY_ITEM;
220 _wearables[SKIN].AssetID = SKIN_ASSET;
221 _wearables[SKIN].ItemID = SKIN_ITEM;
222 _wearables[SHIRT].AssetID = SHIRT_ASSET;
223 _wearables[SHIRT].ItemID = SHIRT_ITEM;
224 _wearables[PANTS].AssetID = PANTS_ASSET;
225 _wearables[PANTS].ItemID = PANTS_ITEM;
226 }
227 }
228} \ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index dd7db62..e3ee2c1 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -550,12 +550,12 @@ namespace OpenSim.Region.Communications.OGS1
550 550
551 /// Appearance 551 /// Appearance
552 /// TODO: stubs for now to get us to a compiling state gently 552 /// TODO: stubs for now to get us to a compiling state gently
553 public UserAppearance GetUserAppearance(LLUUID user) 553 public AvatarAppearance GetUserAppearance(LLUUID user)
554 { 554 {
555 return new UserAppearance(); 555 return new AvatarAppearance();
556 } 556 }
557 557
558 public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) 558 public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
559 { 559 {
560 return; 560 return;
561 } 561 }