aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorcw2007-02-12 01:38:21 +0000
committercw2007-02-12 01:38:21 +0000
commit7322d41d81309bc2dbdcc42c2f984676230688d9 (patch)
tree23a6828cf1b7fe179388030846d16f5de5a10215
parent(no commit message) (diff)
downloadopensim-SC_OLD-7322d41d81309bc2dbdcc42c2f984676230688d9.zip
opensim-SC_OLD-7322d41d81309bc2dbdcc42c2f984676230688d9.tar.gz
opensim-SC_OLD-7322d41d81309bc2dbdcc42c2f984676230688d9.tar.bz2
opensim-SC_OLD-7322d41d81309bc2dbdcc42c2f984676230688d9.tar.xz
[0000048] Animations
Diffstat
-rw-r--r--Agent_Manager.cs36
-rw-r--r--Controller.cs221
-rw-r--r--Globals.cs140
-rw-r--r--Second-server.csproj9
4 files changed, 293 insertions, 113 deletions
diff --git a/Agent_Manager.cs b/Agent_Manager.cs
index 5ff40cd..a5b041c 100644
--- a/Agent_Manager.cs
+++ b/Agent_Manager.cs
@@ -112,7 +112,10 @@ namespace OpenSim
112 agent.Position = new LLVector3(100, 100, 22); 112 agent.Position = new LLVector3(100, 100, 22);
113 agent.BaseFolder = baseFolder; 113 agent.BaseFolder = baseFolder;
114 agent.InventoryFolder = inventoryFolder; 114 agent.InventoryFolder = inventoryFolder;
115 this.AgentList.Add(agent.FullID, agent); 115 agent.AnimID = OpenSim.Globals.Instance.ANIM_AGENT_STAND;
116 agent.AnimSequenceID = 1;
117
118 this.AgentList.Add(agent.FullID, agent);
116 119
117 //Create new Wearable Assets and place in Inventory 120 //Create new Wearable Assets and place in Inventory
118 this.assetManager.CreateNewInventorySet(ref agent, userInfo); 121 this.assetManager.CreateNewInventorySet(ref agent, userInfo);
@@ -149,6 +152,7 @@ namespace OpenSim
149 mov.Data.Position = new LLVector3(100f, 100f, 22f); 152 mov.Data.Position = new LLVector3(100f, 100f, 22f);
150 mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0); 153 mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0);
151 _server.SendPacket(mov, true, userInfo); 154 _server.SendPacket(mov, true, userInfo);
155
152 } 156 }
153 157
154 /// <summary> 158 /// <summary>
@@ -164,8 +168,30 @@ namespace OpenSim
164 kp.Value.Position.Y += (kp.Value.Velocity.Y * 0.2f); 168 kp.Value.Position.Y += (kp.Value.Velocity.Y * 0.2f);
165 kp.Value.Position.Z += (kp.Value.Velocity.Z * 0.2f); 169 kp.Value.Position.Z += (kp.Value.Velocity.Z * 0.2f);
166 } 170 }
171
167 } 172 }
168 173
174 public void UpdateAnim(UserAgentInfo userInfo, LLUUID AnimID, int AnimSeq)
175 {
176 AgentList[userInfo.AgentID].AnimID = AnimID;
177 AgentList[userInfo.AgentID].AnimSequenceID = AnimSeq;
178 UpdateAnim(userInfo);
179 }
180
181 public void UpdateAnim(UserAgentInfo userInfo)
182 {
183 AvatarAnimationPacket ani = new AvatarAnimationPacket();
184 ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1];
185 ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock();
186 ani.AnimationSourceList[0].ObjectID = new LLUUID("00000000000000000000000000000000");
187 ani.Sender = new AvatarAnimationPacket.SenderBlock();
188 ani.Sender.ID = userInfo.AgentID;
189 ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1];
190 ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();
191 ani.AnimationList[0].AnimID = AgentList[userInfo.AgentID].AnimID;
192 ani.AnimationList[0].AnimSequenceID = AgentList[userInfo.AgentID].AnimSequenceID;
193 _server.SendPacket(ani, true, userInfo);
194 }
169 /// <summary> 195 /// <summary>
170 /// 196 ///
171 /// </summary> 197 /// </summary>
@@ -271,7 +297,7 @@ namespace OpenSim
271 //send intial set of captured prims data? 297 //send intial set of captured prims data?
272 this.Prim_Manager.ReadPrimDatabase( "objectdatabase.ini", userInfo); 298 this.Prim_Manager.ReadPrimDatabase( "objectdatabase.ini", userInfo);
273 299
274 //send prims that have been created by users 300 //send prims that have been created by users
275 //prim_man.send_existing_prims(User_info); 301 //prim_man.send_existing_prims(User_info);
276 302
277 //send update about clients avatar 303 //send update about clients avatar
@@ -624,7 +650,9 @@ namespace OpenSim
624 public AvatarWearable[] Wearables; 650 public AvatarWearable[] Wearables;
625 public LLUUID InventoryFolder; 651 public LLUUID InventoryFolder;
626 public LLUUID BaseFolder; 652 public LLUUID BaseFolder;
627 653 public LLUUID AnimID;
654 public int AnimSequenceID;
655
628 public AvatarData() 656 public AvatarData()
629 { 657 {
630 Wearables=new AvatarWearable[2]; //should be 13 658 Wearables=new AvatarWearable[2]; //should be 13
diff --git a/Controller.cs b/Controller.cs
index b7112f1..73d516e 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -104,133 +104,146 @@ namespace OpenSim
104 if( pack.Type == PacketType.AgentSetAppearance ) { 104 if( pack.Type == PacketType.AgentSetAppearance ) {
105 105
106 } 106 }
107 else if( pack.Type == PacketType.FetchInventory) 107 else if (pack.Type == PacketType.AgentAnimation)
108 { 108 {
109 FetchInventoryPacket FetchInventory = (FetchInventoryPacket)pack; 109 AgentAnimationPacket AgentAni = (AgentAnimationPacket)pack;
110 _inventoryManager.FetchInventory(userInfo, FetchInventory); 110 if (AgentAni.AgentData.AgentID == userInfo.AgentID)
111 } 111 {
112 else if( pack.Type == PacketType.FetchInventoryDescendents) 112 _agentManager.UpdateAnim(userInfo, AgentAni.AnimationList[0].AnimID, 1);
113 { 113 }
114 FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)pack; 114 }
115 _inventoryManager.FetchInventoryDescendents(userInfo, Fetch); 115 else if (pack.Type == PacketType.FetchInventory)
116 } 116 {
117 else if(pack.Type == PacketType.MapBlockRequest) 117 FetchInventoryPacket FetchInventory = (FetchInventoryPacket)pack;
118 { 118 _inventoryManager.FetchInventory(userInfo, FetchInventory);
119 MapBlockRequestPacket MapRequest=(MapBlockRequestPacket)pack; 119 }
120 this._gridManager.RequestMapBlock(userInfo, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY); 120 else if (pack.Type == PacketType.FetchInventoryDescendents)
121 121 {
122 } 122 FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)pack;
123 else if( pack.Type == PacketType.UUIDNameRequest) 123 _inventoryManager.FetchInventoryDescendents(userInfo, Fetch);
124 { 124 }
125 UUIDNameRequestPacket nameRequest = (UUIDNameRequestPacket) pack; 125 else if (pack.Type == PacketType.MapBlockRequest)
126 UUIDNameReplyPacket nameReply = new UUIDNameReplyPacket(); 126 {
127 nameReply.UUIDNameBlock = new UUIDNameReplyPacket.UUIDNameBlockBlock[nameRequest.UUIDNameBlock.Length]; 127 MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)pack;
128 128 this._gridManager.RequestMapBlock(userInfo, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY);
129 for(int i = 0; i < nameRequest.UUIDNameBlock.Length; i++) 129
130 { 130 }
131 nameReply.UUIDNameBlock[i] = new UUIDNameReplyPacket.UUIDNameBlockBlock(); 131 else if (pack.Type == PacketType.UUIDNameRequest)
132 nameReply.UUIDNameBlock[i].ID = nameRequest.UUIDNameBlock[i].ID; 132 {
133 nameReply.UUIDNameBlock[i].FirstName = _enc.GetBytes("harry \0"); //for now send any name 133 UUIDNameRequestPacket nameRequest = (UUIDNameRequestPacket)pack;
134 nameReply.UUIDNameBlock[i].LastName = _enc.GetBytes("tom \0"); //in future need to look it up 134 UUIDNameReplyPacket nameReply = new UUIDNameReplyPacket();
135 } 135 nameReply.UUIDNameBlock = new UUIDNameReplyPacket.UUIDNameBlockBlock[nameRequest.UUIDNameBlock.Length];
136 136
137 _server.SendPacket(nameReply, true, userInfo); 137 for (int i = 0; i < nameRequest.UUIDNameBlock.Length; i++)
138 } 138 {
139 else if(pack.Type == PacketType.CloseCircuit) 139 nameReply.UUIDNameBlock[i] = new UUIDNameReplyPacket.UUIDNameBlockBlock();
140 { 140 nameReply.UUIDNameBlock[i].ID = nameRequest.UUIDNameBlock[i].ID;
141 this._agentManager.RemoveAgent(userInfo); 141 nameReply.UUIDNameBlock[i].FirstName = _enc.GetBytes("harry \0"); //for now send any name
142 } 142 nameReply.UUIDNameBlock[i].LastName = _enc.GetBytes("tom \0"); //in future need to look it up
143 else if(pack.Type == PacketType.MapLayerRequest) 143 }
144 { 144
145 this._gridManager.RequestMapLayer(userInfo); 145 _server.SendPacket(nameReply, true, userInfo);
146 } 146 }
147 else if((pack.Type == PacketType.TeleportRequest ) || (pack.Type == PacketType.TeleportLocationRequest)) 147 else if (pack.Type == PacketType.CloseCircuit)
148 { 148 {
149 TeleportLocationRequestPacket Request = (TeleportLocationRequestPacket)pack; 149 this._agentManager.RemoveAgent(userInfo);
150 this._gridManager.RequestTeleport(userInfo,Request); 150 }
151 151 else if (pack.Type == PacketType.MapLayerRequest)
152 } 152 {
153 else if( pack.Type == PacketType.TransferRequest ) { 153 this._gridManager.RequestMapLayer(userInfo);
154 }
155 else if ((pack.Type == PacketType.TeleportRequest) || (pack.Type == PacketType.TeleportLocationRequest))
156 {
157 TeleportLocationRequestPacket Request = (TeleportLocationRequestPacket)pack;
158 this._gridManager.RequestTeleport(userInfo, Request);
159
160 }
161 else if (pack.Type == PacketType.TransferRequest)
162 {
154 TransferRequestPacket transfer = (TransferRequestPacket)pack; 163 TransferRequestPacket transfer = (TransferRequestPacket)pack;
155 LLUUID id = new LLUUID( transfer.TransferInfo.Params, 0 ); 164 LLUUID id = new LLUUID(transfer.TransferInfo.Params, 0);
156 _assetManager.AddAssetRequest( userInfo, id, transfer ); 165 _assetManager.AddAssetRequest(userInfo, id, transfer);
157 } 166 }
158 else if( ( pack.Type == PacketType.StartPingCheck ) ) { 167 else if ((pack.Type == PacketType.StartPingCheck))
168 {
159 //reply to pingcheck 169 //reply to pingcheck
160 libsecondlife.Packets.StartPingCheckPacket startping = (libsecondlife.Packets.StartPingCheckPacket)pack; 170 libsecondlife.Packets.StartPingCheckPacket startping = (libsecondlife.Packets.StartPingCheckPacket)pack;
161 libsecondlife.Packets.CompletePingCheckPacket endping = new CompletePingCheckPacket(); 171 libsecondlife.Packets.CompletePingCheckPacket endping = new CompletePingCheckPacket();
162 endping.PingID.PingID = startping.PingID.PingID; 172 endping.PingID.PingID = startping.PingID.PingID;
163 _server.SendPacket(endping, true, userInfo ); 173 _server.SendPacket(endping, true, userInfo);
174 }
175 else if (pack.Type == PacketType.CompleteAgentMovement)
176 {
177 _agentManager.AgentJoin(userInfo);
164 } 178 }
165 else if( pack.Type == PacketType.CompleteAgentMovement ) 179 else if (pack.Type == PacketType.RequestImage)
166 { 180 {
167 _agentManager.AgentJoin(userInfo );
168 }
169 else if( pack.Type == PacketType.RequestImage )
170 {
171 RequestImagePacket imageRequest = (RequestImagePacket)pack; 181 RequestImagePacket imageRequest = (RequestImagePacket)pack;
172 for( int i = 0; i < imageRequest.RequestImage.Length; i++ ) 182 for (int i = 0; i < imageRequest.RequestImage.Length; i++)
173 { 183 {
174 this._assetManager.AddTextureRequest(userInfo, imageRequest.RequestImage[i].Image); 184 this._assetManager.AddTextureRequest(userInfo, imageRequest.RequestImage[i].Image);
175 } 185 }
176 } 186 }
177 else if( pack.Type == PacketType.RegionHandshakeReply ) { 187 else if (pack.Type == PacketType.RegionHandshakeReply)
188 {
178 //recieved regionhandshake so can now start sending info 189 //recieved regionhandshake so can now start sending info
179 _agentManager.SendInitialData(userInfo ); 190 _agentManager.SendInitialData(userInfo);
180 } 191 }
181 else if( pack.Type == PacketType.ObjectAdd ) 192 else if (pack.Type == PacketType.ObjectAdd)
182 { 193 {
183 ObjectAddPacket ad = (ObjectAddPacket)pack; 194 ObjectAddPacket ad = (ObjectAddPacket)pack;
184 _primManager.CreatePrim(userInfo, ad.ObjectData.RayEnd, ad ); 195 _primManager.CreatePrim(userInfo, ad.ObjectData.RayEnd, ad);
185 } 196 }
186 else if( pack.Type == PacketType.ObjectPosition ) { 197 else if (pack.Type == PacketType.ObjectPosition)
198 {
187 //System.Console.WriteLine(pack.ToString()); 199 //System.Console.WriteLine(pack.ToString());
188 } 200 }
189 else if( pack.Type == PacketType.MultipleObjectUpdate ) 201 else if (pack.Type == PacketType.MultipleObjectUpdate)
190 { 202 {
191 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)pack; 203 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)pack;
192 204
193 for( int i = 0; i < multipleupdate.ObjectData.Length; i++ ) 205 for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
194 { 206 {
195 if( multipleupdate.ObjectData[ i ].Type == 9 ) //change position 207 if (multipleupdate.ObjectData[i].Type == 9) //change position
196 { 208 {
197 libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[ i ].Data, 0 ); 209 libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
198 _primManager.UpdatePrimPosition(userInfo, pos, multipleupdate.ObjectData[ i ].ObjectLocalID ,false ,libsecondlife.LLQuaternion.Identity); 210 _primManager.UpdatePrimPosition(userInfo, pos, multipleupdate.ObjectData[i].ObjectLocalID, false, libsecondlife.LLQuaternion.Identity);
199 //should update stored position of the prim 211 //should update stored position of the prim
200 } 212 }
201 else if(multipleupdate.ObjectData[i].Type == 10 )//rotation 213 else if (multipleupdate.ObjectData[i].Type == 10)//rotation
202 { 214 {
203 libsecondlife.LLVector3 pos = new LLVector3(100,100,22); 215 libsecondlife.LLVector3 pos = new LLVector3(100, 100, 22);
204 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true); 216 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
205 _primManager.UpdatePrimPosition(userInfo, pos, multipleupdate.ObjectData[ i ].ObjectLocalID, true ,rot); 217 _primManager.UpdatePrimPosition(userInfo, pos, multipleupdate.ObjectData[i].ObjectLocalID, true, rot);
206 } 218 }
207 } 219 }
208 } 220 }
209 else if( pack.Type == PacketType.AgentWearablesRequest ) 221 else if (pack.Type == PacketType.AgentWearablesRequest)
210 { 222 {
211 _agentManager.SendIntialAvatarAppearance(userInfo ); 223 _agentManager.SendIntialAvatarAppearance(userInfo);
212 } 224 }
213 else if(pack.Type == PacketType.AgentUpdate) 225 else if (pack.Type == PacketType.AgentUpdate)
214 { 226 {
215 // System.Console.WriteLine("agent update"); 227 // System.Console.WriteLine("agent update");
216 AgentUpdatePacket agent = (AgentUpdatePacket)pack; 228 AgentUpdatePacket agent = (AgentUpdatePacket)pack;
217 uint mask = agent.AgentData.ControlFlags & ( 1 ); 229 uint mask = agent.AgentData.ControlFlags & (1);
218 AvatarData avatar = _agentManager.GetAgent(userInfo.AgentID ); 230 AvatarData avatar = _agentManager.GetAgent(userInfo.AgentID);
219 if(avatar != null ) 231 if (avatar != null)
220 { 232 {
221 if(avatar.Started ) 233 if (avatar.Started)
222 { 234 {
223 if( mask == ( 1 ) ) 235 if (mask == (1))
224 { 236 {
225 if(!avatar.Walk) 237 if (!avatar.Walk)
226 { 238 {
227 //start walking 239 //start walking
228 _agentManager.SendMoveCommand(userInfo, false, avatar.Position.X, avatar.Position.Y, avatar.Position.Z, 0, agent.AgentData.BodyRotation ); 240 _agentManager.SendMoveCommand(userInfo, false, avatar.Position.X, avatar.Position.Y, avatar.Position.Z, 0, agent.AgentData.BodyRotation);
229 Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3( 1, 0, 0 ); 241 _agentManager.UpdateAnim(avatar.NetInfo, Globals.Instance.ANIM_AGENT_WALK, 1);
230 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion( agent.AgentData.BodyRotation.W, agent.AgentData.BodyRotation.X, agent.AgentData.BodyRotation.Y, agent.AgentData.BodyRotation.Z ); 242 Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
243 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(agent.AgentData.BodyRotation.W, agent.AgentData.BodyRotation.X, agent.AgentData.BodyRotation.Y, agent.AgentData.BodyRotation.Z);
231 Axiom.MathLib.Vector3 direc = q * v3; 244 Axiom.MathLib.Vector3 direc = q * v3;
232 direc.Normalize(); 245 direc.Normalize();
233 direc = direc * ( ( 0.03f ) * 128f ); 246 direc = direc * ((0.03f) * 128f);
234 247
235 avatar.Velocity.X = direc.x; 248 avatar.Velocity.X = direc.x;
236 avatar.Velocity.Y = direc.y; 249 avatar.Velocity.Y = direc.y;
@@ -238,12 +251,13 @@ namespace OpenSim
238 avatar.Walk = true; 251 avatar.Walk = true;
239 } 252 }
240 } 253 }
241 else 254 else
242 { 255 {
243 if(avatar.Walk) 256 if (avatar.Walk)
244 { 257 {
245 //walking but key not pressed so need to stop 258 //walking but key not pressed so need to stop
246 _agentManager.SendMoveCommand(userInfo, true, avatar.Position.X, avatar.Position.Y, avatar.Position.Z, 0, agent.AgentData.BodyRotation ); 259 _agentManager.SendMoveCommand(userInfo, true, avatar.Position.X, avatar.Position.Y, avatar.Position.Z, 0, agent.AgentData.BodyRotation);
260 _agentManager.UpdateAnim(avatar.NetInfo, Globals.Instance.ANIM_AGENT_STAND, 1);
247 avatar.Walk = false; 261 avatar.Walk = false;
248 avatar.Velocity.X = 0; 262 avatar.Velocity.X = 0;
249 avatar.Velocity.Y = 0; 263 avatar.Velocity.Y = 0;
@@ -254,32 +268,33 @@ namespace OpenSim
254 } 268 }
255 else 269 else
256 { 270 {
257 271
258 } 272 }
259 } 273 }
260 else if( pack.Type == PacketType.ChatFromViewer ) 274 else if (pack.Type == PacketType.ChatFromViewer)
261 { 275 {
262 ChatFromViewerPacket chat = (ChatFromViewerPacket)pack; 276 ChatFromViewerPacket chat = (ChatFromViewerPacket)pack;
263 System.Text.Encoding enc = System.Text.Encoding.ASCII; 277 System.Text.Encoding enc = System.Text.Encoding.ASCII;
264 278
265 string myString = enc.GetString(chat.ChatData.Message ); 279 string myString = enc.GetString(chat.ChatData.Message);
266 if( myString != "" ) { 280 if (myString != "")
267 string[] comp = new string[ 10 ]; 281 {
282 string[] comp = new string[10];
268 string delimStr = " , "; 283 string delimStr = " , ";
269 char[] delimiter = delimStr.ToCharArray(); 284 char[] delimiter = delimStr.ToCharArray();
270 string line; 285 string line;
271 286
272 line = myString; 287 line = myString;
273 comp = line.Split( delimiter ); 288 comp = line.Split(delimiter);
274 if( comp[ 0 ] == "pos" ) 289 if (comp[0] == "pos")
275 { 290 {
276 } 291 }
277 else if( comp[ 0 ] == "veloc" ) 292 else if (comp[0] == "veloc")
278 { 293 {
279 } 294 }
280 else 295 else
281 { 296 {
282 _agentManager.SendChatMessage(userInfo, line ); 297 _agentManager.SendChatMessage(userInfo, line);
283 } 298 }
284 } 299 }
285 } 300 }
diff --git a/Globals.cs b/Globals.cs
index 066a76d..6aaa00d 100644
--- a/Globals.cs
+++ b/Globals.cs
@@ -28,6 +28,7 @@ Copyright (c) OpenSim project, http://sim.opensecondlife.org/
28*/ 28*/
29 29
30using System; 30using System;
31using libsecondlife;
31 32
32namespace OpenSim 33namespace OpenSim
33{ 34{
@@ -56,7 +57,142 @@ namespace OpenSim
56 57
57 public bool LoginSever = true; 58 public bool LoginSever = true;
58 public ushort LoginServerPort = 8080; 59 public ushort LoginServerPort = 8080;
59 60
60 61 //There's probably a better way to do this (i.e put this somewhere more appropiate), but it'll do for now
62 public LLUUID ANIM_AGENT_AFRAID = new LLUUID("6b61c8e8-4747-0d75-12d7-e49ff207a4ca");
63 public LLUUID ANIM_AGENT_AIM_BAZOOKA_R = new LLUUID("b5b4a67d-0aee-30d2-72cd-77b333e932ef");
64 public LLUUID ANIM_AGENT_AIM_BOW_L = new LLUUID("46bb4359-de38-4ed8-6a22-f1f52fe8f506");
65 public LLUUID ANIM_AGENT_AIM_HANDGUN_R = new LLUUID("3147d815-6338-b932-f011-16b56d9ac18b");
66 public LLUUID ANIM_AGENT_AIM_RIFLE_R = new LLUUID("ea633413-8006-180a-c3ba-96dd1d756720");
67 public LLUUID ANIM_AGENT_ANGRY = new LLUUID("5747a48e-073e-c331-f6f3-7c2149613d3e");
68 public LLUUID ANIM_AGENT_AWAY = new LLUUID("fd037134-85d4-f241-72c6-4f42164fedee");
69 public LLUUID ANIM_AGENT_BACKFLIP = new LLUUID("c4ca6188-9127-4f31-0158-23c4e2f93304");
70 public LLUUID ANIM_AGENT_BELLY_LAUGH = new LLUUID("18b3a4b5-b463-bd48-e4b6-71eaac76c515");
71 public LLUUID ANIM_AGENT_BLOW_KISS = new LLUUID("db84829b-462c-ee83-1e27-9bbee66bd624");
72 public LLUUID ANIM_AGENT_BORED = new LLUUID("b906c4ba-703b-1940-32a3-0c7f7d791510");
73 public LLUUID ANIM_AGENT_BOW = new LLUUID("82e99230-c906-1403-4d9c-3889dd98daba");
74 public LLUUID ANIM_AGENT_BRUSH = new LLUUID("349a3801-54f9-bf2c-3bd0-1ac89772af01");
75 public LLUUID ANIM_AGENT_BUSY = new LLUUID("efcf670c-2d18-8128-973a-034ebc806b67");
76 public LLUUID ANIM_AGENT_CLAP = new LLUUID("9b0c1c4e-8ac7-7969-1494-28c874c4f668");
77 public LLUUID ANIM_AGENT_COURTBOW = new LLUUID("9ba1c942-08be-e43a-fb29-16ad440efc50");
78 public LLUUID ANIM_AGENT_CROUCH = new LLUUID("201f3fdf-cb1f-dbec-201f-7333e328ae7c");
79 public LLUUID ANIM_AGENT_CROUCHWALK = new LLUUID("47f5f6fb-22e5-ae44-f871-73aaaf4a6022");
80 public LLUUID ANIM_AGENT_CRY = new LLUUID("92624d3e-1068-f1aa-a5ec-8244585193ed");
81 public LLUUID ANIM_AGENT_CUSTOMIZE = new LLUUID("038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53");
82 public LLUUID ANIM_AGENT_CUSTOMIZE_DONE = new LLUUID("6883a61a-b27b-5914-a61e-dda118a9ee2c");
83 public LLUUID ANIM_AGENT_DANCE1 = new LLUUID("b68a3d7c-de9e-fc87-eec8-543d787e5b0d");
84 public LLUUID ANIM_AGENT_DANCE2 = new LLUUID("928cae18-e31d-76fd-9cc9-2f55160ff818");
85 public LLUUID ANIM_AGENT_DANCE3 = new LLUUID("30047778-10ea-1af7-6881-4db7a3a5a114");
86 public LLUUID ANIM_AGENT_DANCE4 = new LLUUID("951469f4-c7b2-c818-9dee-ad7eea8c30b7");
87 public LLUUID ANIM_AGENT_DANCE5 = new LLUUID("4bd69a1d-1114-a0b4-625f-84e0a5237155");
88 public LLUUID ANIM_AGENT_DANCE6 = new LLUUID("cd28b69b-9c95-bb78-3f94-8d605ff1bb12");
89 public LLUUID ANIM_AGENT_DANCE7 = new LLUUID("a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6");
90 public LLUUID ANIM_AGENT_DANCE8 = new LLUUID("b0dc417c-1f11-af36-2e80-7e7489fa7cdc");
91 public LLUUID ANIM_AGENT_DEAD = new LLUUID("57abaae6-1d17-7b1b-5f98-6d11a6411276");
92 public LLUUID ANIM_AGENT_DRINK = new LLUUID("0f86e355-dd31-a61c-fdb0-3a96b9aad05f");
93 public LLUUID ANIM_AGENT_EMBARRASSED = new LLUUID("514af488-9051-044a-b3fc-d4dbf76377c6");
94 public LLUUID ANIM_AGENT_EXPRESS_AFRAID = new LLUUID("aa2df84d-cf8f-7218-527b-424a52de766e");
95 public LLUUID ANIM_AGENT_EXPRESS_ANGER = new LLUUID("1a03b575-9634-b62a-5767-3a679e81f4de");
96 public LLUUID ANIM_AGENT_EXPRESS_BORED = new LLUUID("214aa6c1-ba6a-4578-f27c-ce7688f61d0d");
97 public LLUUID ANIM_AGENT_EXPRESS_CRY = new LLUUID("d535471b-85bf-3b4d-a542-93bea4f59d33");
98 public LLUUID ANIM_AGENT_EXPRESS_DISDAIN = new LLUUID("d4416ff1-09d3-300f-4183-1b68a19b9fc1");
99 public LLUUID ANIM_AGENT_EXPRESS_EMBARRASSED = new LLUUID("0b8c8211-d78c-33e8-fa28-c51a9594e424");
100 public LLUUID ANIM_AGENT_EXPRESS_FROWN = new LLUUID("fee3df48-fa3d-1015-1e26-a205810e3001");
101 public LLUUID ANIM_AGENT_EXPRESS_KISS = new LLUUID("1e8d90cc-a84e-e135-884c-7c82c8b03a14");
102 public LLUUID ANIM_AGENT_EXPRESS_LAUGH = new LLUUID("62570842-0950-96f8-341c-809e65110823");
103 public LLUUID ANIM_AGENT_EXPRESS_OPEN_MOUTH = new LLUUID("d63bc1f9-fc81-9625-a0c6-007176d82eb7");
104 public LLUUID ANIM_AGENT_EXPRESS_REPULSED = new LLUUID("f76cda94-41d4-a229-2872-e0296e58afe1");
105 public LLUUID ANIM_AGENT_EXPRESS_SAD = new LLUUID("eb6ebfb2-a4b3-a19c-d388-4dd5c03823f7");
106 public LLUUID ANIM_AGENT_EXPRESS_SHRUG = new LLUUID("a351b1bc-cc94-aac2-7bea-a7e6ebad15ef");
107 public LLUUID ANIM_AGENT_EXPRESS_SMILE = new LLUUID("b7c7c833-e3d3-c4e3-9fc0-131237446312");
108 public LLUUID ANIM_AGENT_EXPRESS_SURPRISE = new LLUUID("728646d9-cc79-08b2-32d6-937f0a835c24");
109 public LLUUID ANIM_AGENT_EXPRESS_TONGUE_OUT = new LLUUID("835965c6-7f2f-bda2-5deb-2478737f91bf");
110 public LLUUID ANIM_AGENT_EXPRESS_TOOTHSMILE = new LLUUID("b92ec1a5-e7ce-a76b-2b05-bcdb9311417e");
111 public LLUUID ANIM_AGENT_EXPRESS_WINK = new LLUUID("da020525-4d94-59d6-23d7-81fdebf33148");
112 public LLUUID ANIM_AGENT_EXPRESS_WORRY = new LLUUID("9c05e5c7-6f07-6ca4-ed5a-b230390c3950");
113 public LLUUID ANIM_AGENT_FALLDOWN = new LLUUID("666307d9-a860-572d-6fd4-c3ab8865c094");
114 public LLUUID ANIM_AGENT_FEMALE_WALK = new LLUUID("f5fc7433-043d-e819-8298-f519a119b688");
115 public LLUUID ANIM_AGENT_FINGER_WAG = new LLUUID("c1bc7f36-3ba0-d844-f93c-93be945d644f");
116 public LLUUID ANIM_AGENT_FIST_PUMP = new LLUUID("7db00ccd-f380-f3ee-439d-61968ec69c8a");
117 public LLUUID ANIM_AGENT_FLY = new LLUUID("aec4610c-757f-bc4e-c092-c6e9caf18daf");
118 public LLUUID ANIM_AGENT_FLYSLOW = new LLUUID("2b5a38b2-5e00-3a97-a495-4c826bc443e6");
119 public LLUUID ANIM_AGENT_HELLO = new LLUUID("9b29cd61-c45b-5689-ded2-91756b8d76a9");
120 public LLUUID ANIM_AGENT_HOLD_BAZOOKA_R = new LLUUID("ef62d355-c815-4816-2474-b1acc21094a6");
121 public LLUUID ANIM_AGENT_HOLD_BOW_L = new LLUUID("8b102617-bcba-037b-86c1-b76219f90c88");
122 public LLUUID ANIM_AGENT_HOLD_HANDGUN_R = new LLUUID("efdc1727-8b8a-c800-4077-975fc27ee2f2");
123 public LLUUID ANIM_AGENT_HOLD_RIFLE_R = new LLUUID("3d94bad0-c55b-7dcc-8763-033c59405d33");
124 public LLUUID ANIM_AGENT_HOLD_THROW_R = new LLUUID("7570c7b5-1f22-56dd-56ef-a9168241bbb6");
125 public LLUUID ANIM_AGENT_HOVER = new LLUUID("4ae8016b-31b9-03bb-c401-b1ea941db41d");
126 public LLUUID ANIM_AGENT_HOVER_DOWN = new LLUUID("20f063ea-8306-2562-0b07-5c853b37b31e");
127 public LLUUID ANIM_AGENT_HOVER_UP = new LLUUID("62c5de58-cb33-5743-3d07-9e4cd4352864");
128 public LLUUID ANIM_AGENT_IMPATIENT = new LLUUID("5ea3991f-c293-392e-6860-91dfa01278a3");
129 public LLUUID ANIM_AGENT_JUMP = new LLUUID("2305bd75-1ca9-b03b-1faa-b176b8a8c49e");
130 public LLUUID ANIM_AGENT_JUMP_FOR_JOY = new LLUUID("709ea28e-1573-c023-8bf8-520c8bc637fa");
131 public LLUUID ANIM_AGENT_KISS_MY_BUTT = new LLUUID("19999406-3a3a-d58c-a2ac-d72e555dcf51");
132 public LLUUID ANIM_AGENT_LAND = new LLUUID("7a17b059-12b2-41b1-570a-186368b6aa6f");
133 public LLUUID ANIM_AGENT_LAUGH_SHORT = new LLUUID("ca5b3f14-3194-7a2b-c894-aa699b718d1f");
134 public LLUUID ANIM_AGENT_MEDIUM_LAND = new LLUUID("f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57");
135 public LLUUID ANIM_AGENT_MOTORCYCLE_SIT = new LLUUID("08464f78-3a8e-2944-cba5-0c94aff3af29");
136 public LLUUID ANIM_AGENT_MUSCLE_BEACH = new LLUUID("315c3a41-a5f3-0ba4-27da-f893f769e69b");
137 public LLUUID ANIM_AGENT_NO = new LLUUID("5a977ed9-7f72-44e9-4c4c-6e913df8ae74");
138 public LLUUID ANIM_AGENT_NO_UNHAPPY = new LLUUID("d83fa0e5-97ed-7eb2-e798-7bd006215cb4");
139 public LLUUID ANIM_AGENT_NYAH_NYAH = new LLUUID("f061723d-0a18-754f-66ee-29a44795a32f");
140 public LLUUID ANIM_AGENT_ONETWO_PUNCH = new LLUUID("eefc79be-daae-a239-8c04-890f5d23654a");
141 public LLUUID ANIM_AGENT_PEACE = new LLUUID("b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9");
142 public LLUUID ANIM_AGENT_POINT_ME = new LLUUID("17c024cc-eef2-f6a0-3527-9869876d7752");
143 public LLUUID ANIM_AGENT_POINT_YOU = new LLUUID("ec952cca-61ef-aa3b-2789-4d1344f016de");
144 public LLUUID ANIM_AGENT_PRE_JUMP = new LLUUID("7a4e87fe-de39-6fcb-6223-024b00893244");
145 public LLUUID ANIM_AGENT_PUNCH_LEFT = new LLUUID("f3300ad9-3462-1d07-2044-0fef80062da0");
146 public LLUUID ANIM_AGENT_PUNCH_RIGHT = new LLUUID("c8e42d32-7310-6906-c903-cab5d4a34656");
147 public LLUUID ANIM_AGENT_REPULSED = new LLUUID("36f81a92-f076-5893-dc4b-7c3795e487cf");
148 public LLUUID ANIM_AGENT_ROUNDHOUSE_KICK = new LLUUID("49aea43b-5ac3-8a44-b595-96100af0beda");
149 public LLUUID ANIM_AGENT_RPS_COUNTDOWN = new LLUUID("35db4f7e-28c2-6679-cea9-3ee108f7fc7f");
150 public LLUUID ANIM_AGENT_RPS_PAPER = new LLUUID("0836b67f-7f7b-f37b-c00a-460dc1521f5a");
151 public LLUUID ANIM_AGENT_RPS_ROCK = new LLUUID("42dd95d5-0bc6-6392-f650-777304946c0f");
152 public LLUUID ANIM_AGENT_RPS_SCISSORS = new LLUUID("16803a9f-5140-e042-4d7b-d28ba247c325");
153 public LLUUID ANIM_AGENT_RUN = new LLUUID("05ddbff8-aaa9-92a1-2b74-8fe77a29b445");
154 public LLUUID ANIM_AGENT_SAD = new LLUUID("0eb702e2-cc5a-9a88-56a5-661a55c0676a");
155 public LLUUID ANIM_AGENT_SALUTE = new LLUUID("cd7668a6-7011-d7e2-ead8-fc69eff1a104");
156 public LLUUID ANIM_AGENT_SHOOT_BOW_L = new LLUUID("e04d450d-fdb5-0432-fd68-818aaf5935f8");
157 public LLUUID ANIM_AGENT_SHOUT = new LLUUID("6bd01860-4ebd-127a-bb3d-d1427e8e0c42");
158 public LLUUID ANIM_AGENT_SHRUG = new LLUUID("70ea714f-3a97-d742-1b01-590a8fcd1db5");
159 public LLUUID ANIM_AGENT_SIT = new LLUUID("1a5fe8ac-a804-8a5d-7cbd-56bd83184568");
160 public LLUUID ANIM_AGENT_SIT_FEMALE = new LLUUID("b1709c8d-ecd3-54a1-4f28-d55ac0840782");
161 public LLUUID ANIM_AGENT_SIT_GENERIC = new LLUUID("245f3c54-f1c0-bf2e-811f-46d8eeb386e7");
162 public LLUUID ANIM_AGENT_SIT_GROUND = new LLUUID("1c7600d6-661f-b87b-efe2-d7421eb93c86");
163 public LLUUID ANIM_AGENT_SIT_GROUND_CONSTRAINED = new LLUUID("1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e");
164 public LLUUID ANIM_AGENT_SIT_TO_STAND = new LLUUID("a8dee56f-2eae-9e7a-05a2-6fb92b97e21e");
165 public LLUUID ANIM_AGENT_SLEEP = new LLUUID("f2bed5f9-9d44-39af-b0cd-257b2a17fe40");
166 public LLUUID ANIM_AGENT_SMOKE_IDLE = new LLUUID("d2f2ee58-8ad1-06c9-d8d3-3827ba31567a");
167 public LLUUID ANIM_AGENT_SMOKE_INHALE = new LLUUID("6802d553-49da-0778-9f85-1599a2266526");
168 public LLUUID ANIM_AGENT_SMOKE_THROW_DOWN = new LLUUID("0a9fb970-8b44-9114-d3a9-bf69cfe804d6");
169 public LLUUID ANIM_AGENT_SNAPSHOT = new LLUUID("eae8905b-271a-99e2-4c0e-31106afd100c");
170 public LLUUID ANIM_AGENT_STAND = new LLUUID("2408fe9e-df1d-1d7d-f4ff-1384fa7b350f");
171 public LLUUID ANIM_AGENT_STANDUP = new LLUUID("3da1d753-028a-5446-24f3-9c9b856d9422");
172 public LLUUID ANIM_AGENT_STAND_1 = new LLUUID("15468e00-3400-bb66-cecc-646d7c14458e");
173 public LLUUID ANIM_AGENT_STAND_2 = new LLUUID("370f3a20-6ca6-9971-848c-9a01bc42ae3c");
174 public LLUUID ANIM_AGENT_STAND_3 = new LLUUID("42b46214-4b44-79ae-deb8-0df61424ff4b");
175 public LLUUID ANIM_AGENT_STAND_4 = new LLUUID("f22fed8b-a5ed-2c93-64d5-bdd8b93c889f");
176 public LLUUID ANIM_AGENT_STRETCH = new LLUUID("80700431-74ec-a008-14f8-77575e73693f");
177 public LLUUID ANIM_AGENT_STRIDE = new LLUUID("1cb562b0-ba21-2202-efb3-30f82cdf9595");
178 public LLUUID ANIM_AGENT_SURF = new LLUUID("41426836-7437-7e89-025d-0aa4d10f1d69");
179 public LLUUID ANIM_AGENT_SURPRISE = new LLUUID("313b9881-4302-73c0-c7d0-0e7a36b6c224");
180 public LLUUID ANIM_AGENT_SWORD_STRIKE = new LLUUID("85428680-6bf9-3e64-b489-6f81087c24bd");
181 public LLUUID ANIM_AGENT_TALK = new LLUUID("5c682a95-6da4-a463-0bf6-0f5b7be129d1");
182 public LLUUID ANIM_AGENT_TANTRUM = new LLUUID("11000694-3f41-adc2-606b-eee1d66f3724");
183 public LLUUID ANIM_AGENT_THROW_R = new LLUUID("aa134404-7dac-7aca-2cba-435f9db875ca");
184 public LLUUID ANIM_AGENT_TRYON_SHIRT = new LLUUID("83ff59fe-2346-f236-9009-4e3608af64c1");
185 public LLUUID ANIM_AGENT_TURNLEFT = new LLUUID("56e0ba0d-4a9f-7f27-6117-32f2ebbf6135");
186 public LLUUID ANIM_AGENT_TURNRIGHT = new LLUUID("2d6daa51-3192-6794-8e2e-a15f8338ec30");
187 public LLUUID ANIM_AGENT_TYPE = new LLUUID("c541c47f-e0c0-058b-ad1a-d6ae3a4584d9");
188 public LLUUID ANIM_AGENT_WALK = new LLUUID("6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0");
189 public LLUUID ANIM_AGENT_WHISPER = new LLUUID("7693f268-06c7-ea71-fa21-2b30d6533f8f");
190 public LLUUID ANIM_AGENT_WHISTLE = new LLUUID("b1ed7982-c68e-a982-7561-52a88a5298c0");
191 public LLUUID ANIM_AGENT_WINK = new LLUUID("869ecdad-a44b-671e-3266-56aef2e3ac2e");
192 public LLUUID ANIM_AGENT_WINK_HOLLYWOOD = new LLUUID("c0c4030f-c02b-49de-24ba-2331f43fe41c");
193 public LLUUID ANIM_AGENT_WORRY = new LLUUID("9f496bd2-589a-709f-16cc-69bf7df1d36c");
194 public LLUUID ANIM_AGENT_YES = new LLUUID("15dd911d-be82-2856-26db-27659b142875");
195 public LLUUID ANIM_AGENT_YES_HAPPY = new LLUUID("b8c8b2a3-9008-1771-3bfc-90924955ab2d");
196 public LLUUID ANIM_AGENT_YOGA_FLOAT = new LLUUID("42ecd00b-9947-a97c-400a-bbc9174c7aeb");
61 } 197 }
62} 198}
diff --git a/Second-server.csproj b/Second-server.csproj
index 5f626d3..c263a32 100644
--- a/Second-server.csproj
+++ b/Second-server.csproj
@@ -6,6 +6,7 @@
6 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 6 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 7 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8 <ProjectGuid>{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}</ProjectGuid> 8 <ProjectGuid>{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}</ProjectGuid>
9 <StartupObject>OpenSim.Controller</StartupObject>
9 </PropertyGroup> 10 </PropertyGroup>
10 <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> 11 <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
11 <OutputPath>bin\Debug\</OutputPath> 12 <OutputPath>bin\Debug\</OutputPath>
@@ -28,6 +29,10 @@
28 <SpecificVersion>False</SpecificVersion> 29 <SpecificVersion>False</SpecificVersion>
29 <HintPath>lib\Axiom.MathLib.dll</HintPath> 30 <HintPath>lib\Axiom.MathLib.dll</HintPath>
30 </Reference> 31 </Reference>
32 <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
33 <SpecificVersion>False</SpecificVersion>
34 <HintPath>..\..\..\..\..\dev\libsecondlife\bin\libsecondlife.dll</HintPath>
35 </Reference>
31 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> 36 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
32 <SpecificVersion>False</SpecificVersion> 37 <SpecificVersion>False</SpecificVersion>
33 <HintPath>lib\log4net.dll</HintPath> 38 <HintPath>lib\log4net.dll</HintPath>
@@ -35,10 +40,6 @@
35 <Reference Include="System" /> 40 <Reference Include="System" />
36 <Reference Include="System.Data" /> 41 <Reference Include="System.Data" />
37 <Reference Include="System.Xml" /> 42 <Reference Include="System.Xml" />
38 <Reference Include="libsecondlife">
39 <HintPath>bin\Release\libsecondlife.dll</HintPath>
40 <SpecificVersion>False</SpecificVersion>
41 </Reference>
42 </ItemGroup> 43 </ItemGroup>
43 <ItemGroup> 44 <ItemGroup>
44 <Compile Include="AssemblyInfo.cs" /> 45 <Compile Include="AssemblyInfo.cs" />
generated by cgit v1.1 at 2024-11-09 01:48:45 +0000