aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-05-01 18:36:43 +0000
committerSean Dague2008-05-01 18:36:43 +0000
commit70f7672dad3534f215396a578fc13f5628e45310 (patch)
tree49cc5a4ea03bb0b7d67f7859d93036aaf1208802
parentLoad grid list in LaunchSLClient from .ini file at run-time. (diff)
downloadopensim-SC-70f7672dad3534f215396a578fc13f5628e45310.zip
opensim-SC-70f7672dad3534f215396a578fc13f5628e45310.tar.gz
opensim-SC-70f7672dad3534f215396a578fc13f5628e45310.tar.bz2
opensim-SC-70f7672dad3534f215396a578fc13f5628e45310.tar.xz
added in IUserService functions. These don't do anything yet,
but the set all compiles together fine, and it provides people an idea of where we are heading.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/IUserService.cs12
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs28
-rw-r--r--OpenSim/Framework/UserAppearance.cs142
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs28
4 files changed, 146 insertions, 64 deletions
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 7c243c6..f8d5541 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -108,5 +108,17 @@ namespace OpenSim.Framework.Communications
108 /// </summary> 108 /// </summary>
109 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> 109 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
110 List<FriendListItem> GetUserFriendList(LLUUID friendlistowner); 110 List<FriendListItem> GetUserFriendList(LLUUID friendlistowner);
111
112 /// <summary>
113 /// Get's the User Appearance
114 UserAppearance GetUserAppearance(LLUUID user);
115
116 void UpdateUserAppearance(LLUUID user, UserAppearance appearance);
117
118 void AddAttachment(LLUUID user, LLUUID attach);
119
120 void RemoveAttachment(LLUUID user, LLUUID attach);
121
122 List<LLUUID> GetAttachments(LLUUID user);
111 } 123 }
112} \ No newline at end of file 124} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index e4d8ca2..dbbc58f 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -595,5 +595,33 @@ namespace OpenSim.Framework.Communications
595 } 595 }
596 return false; 596 return false;
597 } 597 }
598
599 /// Appearance
600 /// TODO: stubs for now to get us to a compiling state gently
601 public UserAppearance GetUserAppearance(LLUUID user)
602 {
603 return new UserAppearance();
604 }
605
606 public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
607 {
608 return;
609 }
610
611 public void AddAttachment(LLUUID user, LLUUID item)
612 {
613 return;
614 }
615
616 public void RemoveAttachment(LLUUID user, LLUUID item)
617 {
618 return;
619 }
620
621 public List<LLUUID> GetAttachments(LLUUID user)
622 {
623 return new List<LLUUID>();
624 }
625
598 } 626 }
599} \ No newline at end of file 627} \ No newline at end of file
diff --git a/OpenSim/Framework/UserAppearance.cs b/OpenSim/Framework/UserAppearance.cs
index b58ed2d..b2d5679 100644
--- a/OpenSim/Framework/UserAppearance.cs
+++ b/OpenSim/Framework/UserAppearance.cs
@@ -63,133 +63,147 @@ namespace OpenSim.Framework
63 private static LLUUID PANTS_ASSET = new LLUUID("00000000-38f9-1111-024e-222222111120"); 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"); 64 private static LLUUID PANTS_ITEM = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111");
65 65
66 private AvatarWearable[] wearables; 66 private AvatarWearable[] _wearables;
67 67 private LLUUID _user;
68 private int _serial;
69
68 public UserAppearance() 70 public UserAppearance()
69 { 71 {
70 wearables = new AvatarWearable[MAX_WEARABLES]; 72 _wearables = new AvatarWearable[MAX_WEARABLES];
71 for (int i = 0; i < MAX_WEARABLES; i++) 73 for (int i = 0; i < MAX_WEARABLES; i++)
72 { 74 {
73 // this makes them all null 75 // this makes them all null
74 wearables[i] = new AvatarWearable(); 76 _wearables[i] = new AvatarWearable();
75 } 77 }
78 _serial = 0;
79 _user = LLUUID.Zero;
80 }
81
82 public LLUUID User {
83 get { return _user; }
84 set { _user = value; }
85 }
86
87 public int Serial {
88 get { return _serial; }
89 set { _serial = value; }
76 } 90 }
77 91
78 public LLUUID BodyItem { 92 public LLUUID BodyItem {
79 get { return wearables[BODY].ItemID; } 93 get { return _wearables[BODY].ItemID; }
80 set { wearables[BODY].ItemID = value; } 94 set { _wearables[BODY].ItemID = value; }
81 } 95 }
82 public LLUUID BodyAsset { 96 public LLUUID BodyAsset {
83 get { return wearables[BODY].AssetID; } 97 get { return _wearables[BODY].AssetID; }
84 set { wearables[BODY].AssetID = value; } 98 set { _wearables[BODY].AssetID = value; }
85 } 99 }
86 public LLUUID SkinItem { 100 public LLUUID SkinItem {
87 get { return wearables[SKIN].ItemID; } 101 get { return _wearables[SKIN].ItemID; }
88 set { wearables[SKIN].ItemID = value; } 102 set { _wearables[SKIN].ItemID = value; }
89 } 103 }
90 public LLUUID SkinAsset { 104 public LLUUID SkinAsset {
91 get { return wearables[SKIN].AssetID; } 105 get { return _wearables[SKIN].AssetID; }
92 set { wearables[SKIN].AssetID = value; } 106 set { _wearables[SKIN].AssetID = value; }
93 } 107 }
94 public LLUUID HairItem { 108 public LLUUID HairItem {
95 get { return wearables[HAIR].ItemID; } 109 get { return _wearables[HAIR].ItemID; }
96 set { wearables[HAIR].ItemID = value; } 110 set { _wearables[HAIR].ItemID = value; }
97 } 111 }
98 public LLUUID HairAsset { 112 public LLUUID HairAsset {
99 get { return wearables[HAIR].AssetID; } 113 get { return _wearables[HAIR].AssetID; }
100 set { wearables[HAIR].AssetID = value; } 114 set { _wearables[HAIR].AssetID = value; }
101 } 115 }
102 public LLUUID EyesItem { 116 public LLUUID EyesItem {
103 get { return wearables[EYES].ItemID; } 117 get { return _wearables[EYES].ItemID; }
104 set { wearables[EYES].ItemID = value; } 118 set { _wearables[EYES].ItemID = value; }
105 } 119 }
106 public LLUUID EyesAsset { 120 public LLUUID EyesAsset {
107 get { return wearables[EYES].AssetID; } 121 get { return _wearables[EYES].AssetID; }
108 set { wearables[EYES].AssetID = value; } 122 set { _wearables[EYES].AssetID = value; }
109 } 123 }
110 public LLUUID ShirtItem { 124 public LLUUID ShirtItem {
111 get { return wearables[SHIRT].ItemID; } 125 get { return _wearables[SHIRT].ItemID; }
112 set { wearables[SHIRT].ItemID = value; } 126 set { _wearables[SHIRT].ItemID = value; }
113 } 127 }
114 public LLUUID ShirtAsset { 128 public LLUUID ShirtAsset {
115 get { return wearables[SHIRT].AssetID; } 129 get { return _wearables[SHIRT].AssetID; }
116 set { wearables[SHIRT].AssetID = value; } 130 set { _wearables[SHIRT].AssetID = value; }
117 } 131 }
118 public LLUUID PantsItem { 132 public LLUUID PantsItem {
119 get { return wearables[PANTS].ItemID; } 133 get { return _wearables[PANTS].ItemID; }
120 set { wearables[PANTS].ItemID = value; } 134 set { _wearables[PANTS].ItemID = value; }
121 } 135 }
122 public LLUUID PantsAsset { 136 public LLUUID PantsAsset {
123 get { return wearables[BODY].AssetID; } 137 get { return _wearables[BODY].AssetID; }
124 set { wearables[BODY].AssetID = value; } 138 set { _wearables[BODY].AssetID = value; }
125 } 139 }
126 public LLUUID ShoesItem { 140 public LLUUID ShoesItem {
127 get { return wearables[SHOES].ItemID; } 141 get { return _wearables[SHOES].ItemID; }
128 set { wearables[SHOES].ItemID = value; } 142 set { _wearables[SHOES].ItemID = value; }
129 } 143 }
130 public LLUUID ShoesAsset { 144 public LLUUID ShoesAsset {
131 get { return wearables[SHOES].AssetID; } 145 get { return _wearables[SHOES].AssetID; }
132 set { wearables[SHOES].AssetID = value; } 146 set { _wearables[SHOES].AssetID = value; }
133 } 147 }
134 public LLUUID SocksItem { 148 public LLUUID SocksItem {
135 get { return wearables[SOCKS].ItemID; } 149 get { return _wearables[SOCKS].ItemID; }
136 set { wearables[SOCKS].ItemID = value; } 150 set { _wearables[SOCKS].ItemID = value; }
137 } 151 }
138 public LLUUID SocksAsset { 152 public LLUUID SocksAsset {
139 get { return wearables[SOCKS].AssetID; } 153 get { return _wearables[SOCKS].AssetID; }
140 set { wearables[SOCKS].AssetID = value; } 154 set { _wearables[SOCKS].AssetID = value; }
141 } 155 }
142 public LLUUID JacketItem { 156 public LLUUID JacketItem {
143 get { return wearables[JACKET].ItemID; } 157 get { return _wearables[JACKET].ItemID; }
144 set { wearables[JACKET].ItemID = value; } 158 set { _wearables[JACKET].ItemID = value; }
145 } 159 }
146 public LLUUID JacketAsset { 160 public LLUUID JacketAsset {
147 get { return wearables[JACKET].AssetID; } 161 get { return _wearables[JACKET].AssetID; }
148 set { wearables[JACKET].AssetID = value; } 162 set { _wearables[JACKET].AssetID = value; }
149 } 163 }
150 public LLUUID GlovesItem { 164 public LLUUID GlovesItem {
151 get { return wearables[GLOVES].ItemID; } 165 get { return _wearables[GLOVES].ItemID; }
152 set { wearables[GLOVES].ItemID = value; } 166 set { _wearables[GLOVES].ItemID = value; }
153 } 167 }
154 public LLUUID GlovesAsset { 168 public LLUUID GlovesAsset {
155 get { return wearables[GLOVES].AssetID; } 169 get { return _wearables[GLOVES].AssetID; }
156 set { wearables[GLOVES].AssetID = value; } 170 set { _wearables[GLOVES].AssetID = value; }
157 } 171 }
158 public LLUUID UnderShirtItem { 172 public LLUUID UnderShirtItem {
159 get { return wearables[UNDERSHIRT].ItemID; } 173 get { return _wearables[UNDERSHIRT].ItemID; }
160 set { wearables[UNDERSHIRT].ItemID = value; } 174 set { _wearables[UNDERSHIRT].ItemID = value; }
161 } 175 }
162 public LLUUID UnderShirtAsset { 176 public LLUUID UnderShirtAsset {
163 get { return wearables[UNDERSHIRT].AssetID; } 177 get { return _wearables[UNDERSHIRT].AssetID; }
164 set { wearables[UNDERSHIRT].AssetID = value; } 178 set { _wearables[UNDERSHIRT].AssetID = value; }
165 } 179 }
166 public LLUUID UnderPantsItem { 180 public LLUUID UnderPantsItem {
167 get { return wearables[UNDERPANTS].ItemID; } 181 get { return _wearables[UNDERPANTS].ItemID; }
168 set { wearables[UNDERPANTS].ItemID = value; } 182 set { _wearables[UNDERPANTS].ItemID = value; }
169 } 183 }
170 public LLUUID UnderPantsAsset { 184 public LLUUID UnderPantsAsset {
171 get { return wearables[UNDERPANTS].AssetID; } 185 get { return _wearables[UNDERPANTS].AssetID; }
172 set { wearables[UNDERPANTS].AssetID = value; } 186 set { _wearables[UNDERPANTS].AssetID = value; }
173 } 187 }
174 public LLUUID SkirtItem { 188 public LLUUID SkirtItem {
175 get { return wearables[SKIRT].ItemID; } 189 get { return _wearables[SKIRT].ItemID; }
176 set { wearables[SKIRT].ItemID = value; } 190 set { _wearables[SKIRT].ItemID = value; }
177 } 191 }
178 public LLUUID SkirtAsset { 192 public LLUUID SkirtAsset {
179 get { return wearables[SKIRT].AssetID; } 193 get { return _wearables[SKIRT].AssetID; }
180 set { wearables[SKIRT].AssetID = value; } 194 set { _wearables[SKIRT].AssetID = value; }
181 } 195 }
182 196
183 public void SetDefaultWearables() 197 public void SetDefaultWearables()
184 { 198 {
185 wearables[BODY].AssetID = BODY_ASSET; 199 _wearables[BODY].AssetID = BODY_ASSET;
186 wearables[BODY].ItemID = BODY_ITEM; 200 _wearables[BODY].ItemID = BODY_ITEM;
187 wearables[SKIN].AssetID = SKIN_ASSET; 201 _wearables[SKIN].AssetID = SKIN_ASSET;
188 wearables[SKIN].ItemID = SKIN_ITEM; 202 _wearables[SKIN].ItemID = SKIN_ITEM;
189 wearables[SHIRT].AssetID = SHIRT_ASSET; 203 _wearables[SHIRT].AssetID = SHIRT_ASSET;
190 wearables[SHIRT].ItemID = SHIRT_ITEM; 204 _wearables[SHIRT].ItemID = SHIRT_ITEM;
191 wearables[PANTS].AssetID = PANTS_ASSET; 205 _wearables[PANTS].AssetID = PANTS_ASSET;
192 wearables[PANTS].ItemID = PANTS_ITEM; 206 _wearables[PANTS].ItemID = PANTS_ITEM;
193 } 207 }
194 } 208 }
195} \ No newline at end of file 209} \ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 643d15b..dd7db62 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -547,5 +547,33 @@ namespace OpenSim.Region.Communications.OGS1
547 } 547 }
548 548
549 #endregion 549 #endregion
550
551 /// Appearance
552 /// TODO: stubs for now to get us to a compiling state gently
553 public UserAppearance GetUserAppearance(LLUUID user)
554 {
555 return new UserAppearance();
556 }
557
558 public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
559 {
560 return;
561 }
562
563 public void AddAttachment(LLUUID user, LLUUID item)
564 {
565 return;
566 }
567
568 public void RemoveAttachment(LLUUID user, LLUUID item)
569 {
570 return;
571 }
572
573 public List<LLUUID> GetAttachments(LLUUID user)
574 {
575 return new List<LLUUID>();
576 }
577
550 } 578 }
551} 579}