aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AgentCircuitData.cs
diff options
context:
space:
mode:
authoropensim mirror account2010-11-08 04:50:04 -0800
committeropensim mirror account2010-11-08 04:50:04 -0800
commit4a20a544d67bec4243208fe64e09bc5a260dc00b (patch)
tree6663b9a8f36fa5e21eb1c5f2560f8e177066ba57 /OpenSim/Framework/AgentCircuitData.cs
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-4a20a544d67bec4243208fe64e09bc5a260dc00b.zip
opensim-SC_OLD-4a20a544d67bec4243208fe64e09bc5a260dc00b.tar.gz
opensim-SC_OLD-4a20a544d67bec4243208fe64e09bc5a260dc00b.tar.bz2
opensim-SC_OLD-4a20a544d67bec4243208fe64e09bc5a260dc00b.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Framework/AgentCircuitData.cs')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 7b14ac7..cc9fcea 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -203,7 +203,7 @@ namespace OpenSim.Framework
203 args["inventory_folder"] = OSD.FromUUID(InventoryFolder); 203 args["inventory_folder"] = OSD.FromUUID(InventoryFolder);
204 args["secure_session_id"] = OSD.FromUUID(SecureSessionID); 204 args["secure_session_id"] = OSD.FromUUID(SecureSessionID);
205 args["session_id"] = OSD.FromUUID(SessionID); 205 args["session_id"] = OSD.FromUUID(SessionID);
206 206
207 args["service_session_id"] = OSD.FromString(ServiceSessionID); 207 args["service_session_id"] = OSD.FromString(ServiceSessionID);
208 args["start_pos"] = OSD.FromString(startpos.ToString()); 208 args["start_pos"] = OSD.FromString(startpos.ToString());
209 args["client_ip"] = OSD.FromString(IPAddress); 209 args["client_ip"] = OSD.FromString(IPAddress);
@@ -219,7 +219,7 @@ namespace OpenSim.Framework
219 OSDMap appmap = Appearance.Pack(); 219 OSDMap appmap = Appearance.Pack();
220 args["packed_appearance"] = appmap; 220 args["packed_appearance"] = appmap;
221 } 221 }
222 222
223 if (ServiceURLs != null && ServiceURLs.Count > 0) 223 if (ServiceURLs != null && ServiceURLs.Count > 0)
224 { 224 {
225 OSDArray urls = new OSDArray(ServiceURLs.Count * 2); 225 OSDArray urls = new OSDArray(ServiceURLs.Count * 2);
@@ -307,7 +307,7 @@ namespace OpenSim.Framework
307// DEBUG OFF 307// DEBUG OFF
308 308
309 try { 309 try {
310 // Unpack various appearance elements 310 // Unpack various appearance elements
311 Appearance = new AvatarAppearance(AgentID); 311 Appearance = new AvatarAppearance(AgentID);
312 312
313 // Eventually this code should be deprecated, use full appearance 313 // Eventually this code should be deprecated, use full appearance