diff options
Diffstat (limited to 'OpenSim/Client/MXP')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 176 | ||||
-rw-r--r-- | OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | 5 |
2 files changed, 90 insertions, 91 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index b5b2508..af9478e 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -305,94 +305,94 @@ namespace OpenSim.Client.MXP.ClientStack | |||
305 | 305 | ||
306 | #region MXP Outgoing Message Processing | 306 | #region MXP Outgoing Message Processing |
307 | 307 | ||
308 | private void MXPSendPrimitive(uint localID, UUID ownerID, Vector3 acc, Vector3 rvel, PrimitiveBaseShape primShape, Vector3 pos, UUID objectID, Vector3 vel, Quaternion rotation, uint flags, string text, byte[] textColor, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim) | 308 | // private void MXPSendPrimitive(uint localID, UUID ownerID, Vector3 acc, Vector3 rvel, PrimitiveBaseShape primShape, Vector3 pos, UUID objectID, Vector3 vel, Quaternion rotation, uint flags, string text, byte[] textColor, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim) |
309 | { | 309 | // { |
310 | String typeName = ToOmType(primShape.PCode); | 310 | // String typeName = ToOmType(primShape.PCode); |
311 | m_log.Info("[MXP ClientStack] Transmitting Primitive" + typeName); | 311 | // m_log.Info("[MXP ClientStack] Transmitting Primitive" + typeName); |
312 | 312 | // | |
313 | PerceptionEventMessage pe = new PerceptionEventMessage(); | 313 | // PerceptionEventMessage pe = new PerceptionEventMessage(); |
314 | pe.ObjectFragment.ObjectId = objectID.Guid; | 314 | // pe.ObjectFragment.ObjectId = objectID.Guid; |
315 | 315 | // | |
316 | pe.ObjectFragment.ParentObjectId = Guid.Empty; | 316 | // pe.ObjectFragment.ParentObjectId = Guid.Empty; |
317 | 317 | // | |
318 | // Resolving parent UUID. | 318 | // // Resolving parent UUID. |
319 | OpenSim.Region.Framework.Scenes.Scene scene = (OpenSim.Region.Framework.Scenes.Scene)Scene; | 319 | // OpenSim.Region.Framework.Scenes.Scene scene = (OpenSim.Region.Framework.Scenes.Scene)Scene; |
320 | if (scene.Entities.ContainsKey(parentID)) | 320 | // if (scene.Entities.ContainsKey(parentID)) |
321 | { | 321 | // { |
322 | pe.ObjectFragment.ParentObjectId = scene.Entities[parentID].UUID.Guid; | 322 | // pe.ObjectFragment.ParentObjectId = scene.Entities[parentID].UUID.Guid; |
323 | } | 323 | // } |
324 | 324 | // | |
325 | pe.ObjectFragment.ObjectIndex = localID; | 325 | // pe.ObjectFragment.ObjectIndex = localID; |
326 | pe.ObjectFragment.ObjectName = typeName + " Object"; | 326 | // pe.ObjectFragment.ObjectName = typeName + " Object"; |
327 | pe.ObjectFragment.OwnerId = ownerID.Guid; | 327 | // pe.ObjectFragment.OwnerId = ownerID.Guid; |
328 | pe.ObjectFragment.TypeId = Guid.Empty; | 328 | // pe.ObjectFragment.TypeId = Guid.Empty; |
329 | pe.ObjectFragment.TypeName = typeName; | 329 | // pe.ObjectFragment.TypeName = typeName; |
330 | pe.ObjectFragment.Acceleration = ToOmVector(acc); | 330 | // pe.ObjectFragment.Acceleration = ToOmVector(acc); |
331 | pe.ObjectFragment.AngularAcceleration=new MsdQuaternion4f(); | 331 | // pe.ObjectFragment.AngularAcceleration=new MsdQuaternion4f(); |
332 | pe.ObjectFragment.AngularVelocity = ToOmQuaternion(rvel); | 332 | // pe.ObjectFragment.AngularVelocity = ToOmQuaternion(rvel); |
333 | pe.ObjectFragment.BoundingSphereRadius = primShape.Scale.Length(); | 333 | // pe.ObjectFragment.BoundingSphereRadius = primShape.Scale.Length(); |
334 | 334 | // | |
335 | pe.ObjectFragment.Location = ToOmVector(pos); | 335 | // pe.ObjectFragment.Location = ToOmVector(pos); |
336 | 336 | // | |
337 | pe.ObjectFragment.Mass = 1.0f; | 337 | // pe.ObjectFragment.Mass = 1.0f; |
338 | pe.ObjectFragment.Orientation = ToOmQuaternion(rotation); | 338 | // pe.ObjectFragment.Orientation = ToOmQuaternion(rotation); |
339 | pe.ObjectFragment.Velocity =ToOmVector(vel); | 339 | // pe.ObjectFragment.Velocity =ToOmVector(vel); |
340 | 340 | // | |
341 | OmSlPrimitiveExt ext = new OmSlPrimitiveExt(); | 341 | // OmSlPrimitiveExt ext = new OmSlPrimitiveExt(); |
342 | 342 | // | |
343 | if (!((primShape.PCode == (byte)PCode.NewTree) || (primShape.PCode == (byte)PCode.Tree) || (primShape.PCode == (byte)PCode.Grass))) | 343 | // if (!((primShape.PCode == (byte)PCode.NewTree) || (primShape.PCode == (byte)PCode.Tree) || (primShape.PCode == (byte)PCode.Grass))) |
344 | { | 344 | // { |
345 | 345 | // | |
346 | ext.PathBegin = primShape.PathBegin; | 346 | // ext.PathBegin = primShape.PathBegin; |
347 | ext.PathEnd = primShape.PathEnd; | 347 | // ext.PathEnd = primShape.PathEnd; |
348 | ext.PathScaleX = primShape.PathScaleX; | 348 | // ext.PathScaleX = primShape.PathScaleX; |
349 | ext.PathScaleY = primShape.PathScaleY; | 349 | // ext.PathScaleY = primShape.PathScaleY; |
350 | ext.PathShearX = primShape.PathShearX; | 350 | // ext.PathShearX = primShape.PathShearX; |
351 | ext.PathShearY = primShape.PathShearY; | 351 | // ext.PathShearY = primShape.PathShearY; |
352 | ext.PathSkew = primShape.PathSkew; | 352 | // ext.PathSkew = primShape.PathSkew; |
353 | ext.ProfileBegin = primShape.ProfileBegin; | 353 | // ext.ProfileBegin = primShape.ProfileBegin; |
354 | ext.ProfileEnd = primShape.ProfileEnd; | 354 | // ext.ProfileEnd = primShape.ProfileEnd; |
355 | ext.PathCurve = primShape.PathCurve; | 355 | // ext.PathCurve = primShape.PathCurve; |
356 | ext.ProfileCurve = primShape.ProfileCurve; | 356 | // ext.ProfileCurve = primShape.ProfileCurve; |
357 | ext.ProfileHollow = primShape.ProfileHollow; | 357 | // ext.ProfileHollow = primShape.ProfileHollow; |
358 | ext.PathRadiusOffset = primShape.PathRadiusOffset; | 358 | // ext.PathRadiusOffset = primShape.PathRadiusOffset; |
359 | ext.PathRevolutions = primShape.PathRevolutions; | 359 | // ext.PathRevolutions = primShape.PathRevolutions; |
360 | ext.PathTaperX = primShape.PathTaperX; | 360 | // ext.PathTaperX = primShape.PathTaperX; |
361 | ext.PathTaperY = primShape.PathTaperY; | 361 | // ext.PathTaperY = primShape.PathTaperY; |
362 | ext.PathTwist = primShape.PathTwist; | 362 | // ext.PathTwist = primShape.PathTwist; |
363 | ext.PathTwistBegin = primShape.PathTwistBegin; | 363 | // ext.PathTwistBegin = primShape.PathTwistBegin; |
364 | 364 | // | |
365 | 365 | // | |
366 | } | 366 | // } |
367 | 367 | // | |
368 | ext.UpdateFlags = flags; | 368 | // ext.UpdateFlags = flags; |
369 | ext.ExtraParams = primShape.ExtraParams; | 369 | // ext.ExtraParams = primShape.ExtraParams; |
370 | ext.State = primShape.State; | 370 | // ext.State = primShape.State; |
371 | ext.TextureEntry = primShape.TextureEntry; | 371 | // ext.TextureEntry = primShape.TextureEntry; |
372 | ext.TextureAnim = textureanim; | 372 | // ext.TextureAnim = textureanim; |
373 | ext.Scale = ToOmVector(primShape.Scale); | 373 | // ext.Scale = ToOmVector(primShape.Scale); |
374 | ext.Text = text; | 374 | // ext.Text = text; |
375 | ext.TextColor = ToOmColor(textColor); | 375 | // ext.TextColor = ToOmColor(textColor); |
376 | ext.PSBlock = particleSystem; | 376 | // ext.PSBlock = particleSystem; |
377 | ext.ClickAction = clickAction; | 377 | // ext.ClickAction = clickAction; |
378 | ext.Material = material; | 378 | // ext.Material = material; |
379 | 379 | // | |
380 | pe.SetExtension<OmSlPrimitiveExt>(ext); | 380 | // pe.SetExtension<OmSlPrimitiveExt>(ext); |
381 | 381 | // | |
382 | Session.Send(pe); | 382 | // Session.Send(pe); |
383 | 383 | // | |
384 | if (m_objectsSynchronized != -1) | 384 | // if (m_objectsSynchronized != -1) |
385 | { | 385 | // { |
386 | m_objectsSynchronized++; | 386 | // m_objectsSynchronized++; |
387 | 387 | // | |
388 | if (m_objectsToSynchronize >= m_objectsSynchronized) | 388 | // if (m_objectsToSynchronize >= m_objectsSynchronized) |
389 | { | 389 | // { |
390 | SynchronizationEndEventMessage synchronizationEndEventMessage = new SynchronizationEndEventMessage(); | 390 | // SynchronizationEndEventMessage synchronizationEndEventMessage = new SynchronizationEndEventMessage(); |
391 | Session.Send(synchronizationEndEventMessage); | 391 | // Session.Send(synchronizationEndEventMessage); |
392 | m_objectsSynchronized = -1; | 392 | // m_objectsSynchronized = -1; |
393 | } | 393 | // } |
394 | } | 394 | // } |
395 | } | 395 | // } |
396 | 396 | ||
397 | public void MXPSendAvatarData(string participantName, UUID ownerID, UUID parentId, UUID avatarID, uint avatarLocalID, Vector3 position, Quaternion rotation) | 397 | public void MXPSendAvatarData(string participantName, UUID ownerID, UUID parentId, UUID avatarID, uint avatarLocalID, Vector3 position, Quaternion rotation) |
398 | { | 398 | { |
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs index 2098625..7056e01 100644 --- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs +++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
63 | private readonly IList<MXPClientView> m_sessionsToRemove = new List<MXPClientView>(); | 63 | private readonly IList<MXPClientView> m_sessionsToRemove = new List<MXPClientView>(); |
64 | 64 | ||
65 | private readonly int m_port; | 65 | private readonly int m_port; |
66 | private readonly bool m_accountsAuthenticate; | 66 | // private readonly bool m_accountsAuthenticate; |
67 | 67 | ||
68 | private readonly String m_programName; | 68 | private readonly String m_programName; |
69 | private readonly byte m_programMajorVersion; | 69 | private readonly byte m_programMajorVersion; |
@@ -76,7 +76,7 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
76 | public MXPPacketServer(int port, Dictionary<UUID, Scene> scenes, bool accountsAuthenticate) | 76 | public MXPPacketServer(int port, Dictionary<UUID, Scene> scenes, bool accountsAuthenticate) |
77 | { | 77 | { |
78 | m_port = port; | 78 | m_port = port; |
79 | m_accountsAuthenticate = accountsAuthenticate; | 79 | // m_accountsAuthenticate = accountsAuthenticate; |
80 | 80 | ||
81 | m_scenes = scenes; | 81 | m_scenes = scenes; |
82 | 82 | ||
@@ -491,7 +491,6 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
491 | 491 | ||
492 | public bool AuthoriseUser(string participantName, string password, UUID sceneId, out UserAccount account) | 492 | public bool AuthoriseUser(string participantName, string password, UUID sceneId, out UserAccount account) |
493 | { | 493 | { |
494 | UUID userId = UUID.Zero; | ||
495 | string firstName = ""; | 494 | string firstName = ""; |
496 | string lastName = ""; | 495 | string lastName = ""; |
497 | account = null; | 496 | account = null; |