OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: remove mono compiler warnings

prebuild-update
Justin Clark-Casey (justincc) 2010-09-03 23:29:39 +01:00
parent b8da15c104
commit 63617c79d8
3 changed files with 91 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
OpenSim/Client/MXP/ClientStack/MXPClientView.cs
View File

@ -305,94 +305,94 @@ namespace OpenSim.Client.MXP.ClientStack
#region MXP Outgoing Message Processing
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)
{
String typeName = ToOmType(primShape.PCode);
m_log.Info("[MXP ClientStack] Transmitting Primitive" + typeName);
PerceptionEventMessage pe = new PerceptionEventMessage();
pe.ObjectFragment.ObjectId = objectID.Guid;
pe.ObjectFragment.ParentObjectId = Guid.Empty;
// Resolving parent UUID.
OpenSim.Region.Framework.Scenes.Scene scene = (OpenSim.Region.Framework.Scenes.Scene)Scene;
if (scene.Entities.ContainsKey(parentID))
{
pe.ObjectFragment.ParentObjectId = scene.Entities[parentID].UUID.Guid;
}
pe.ObjectFragment.ObjectIndex = localID;
pe.ObjectFragment.ObjectName = typeName + " Object";
pe.ObjectFragment.OwnerId = ownerID.Guid;
pe.ObjectFragment.TypeId = Guid.Empty;
pe.ObjectFragment.TypeName = typeName;
pe.ObjectFragment.Acceleration = ToOmVector(acc);
pe.ObjectFragment.AngularAcceleration=new MsdQuaternion4f();
pe.ObjectFragment.AngularVelocity = ToOmQuaternion(rvel);
pe.ObjectFragment.BoundingSphereRadius = primShape.Scale.Length();
pe.ObjectFragment.Location = ToOmVector(pos);
pe.ObjectFragment.Mass = 1.0f;
pe.ObjectFragment.Orientation = ToOmQuaternion(rotation);
pe.ObjectFragment.Velocity =ToOmVector(vel);
OmSlPrimitiveExt ext = new OmSlPrimitiveExt();
if (!((primShape.PCode == (byte)PCode.NewTree) || (primShape.PCode == (byte)PCode.Tree) || (primShape.PCode == (byte)PCode.Grass)))
{
ext.PathBegin = primShape.PathBegin;
ext.PathEnd = primShape.PathEnd;
ext.PathScaleX = primShape.PathScaleX;
ext.PathScaleY = primShape.PathScaleY;
ext.PathShearX = primShape.PathShearX;
ext.PathShearY = primShape.PathShearY;
ext.PathSkew = primShape.PathSkew;
ext.ProfileBegin = primShape.ProfileBegin;
ext.ProfileEnd = primShape.ProfileEnd;
ext.PathCurve = primShape.PathCurve;
ext.ProfileCurve = primShape.ProfileCurve;
ext.ProfileHollow = primShape.ProfileHollow;
ext.PathRadiusOffset = primShape.PathRadiusOffset;
ext.PathRevolutions = primShape.PathRevolutions;
ext.PathTaperX = primShape.PathTaperX;
ext.PathTaperY = primShape.PathTaperY;
ext.PathTwist = primShape.PathTwist;
ext.PathTwistBegin = primShape.PathTwistBegin;
}
ext.UpdateFlags = flags;
ext.ExtraParams = primShape.ExtraParams;
ext.State = primShape.State;
ext.TextureEntry = primShape.TextureEntry;
ext.TextureAnim = textureanim;
ext.Scale = ToOmVector(primShape.Scale);
ext.Text = text;
ext.TextColor = ToOmColor(textColor);
ext.PSBlock = particleSystem;
ext.ClickAction = clickAction;
ext.Material = material;
pe.SetExtension<OmSlPrimitiveExt>(ext);
Session.Send(pe);
if (m_objectsSynchronized != -1)
{
m_objectsSynchronized++;
if (m_objectsToSynchronize >= m_objectsSynchronized)
{
SynchronizationEndEventMessage synchronizationEndEventMessage = new SynchronizationEndEventMessage();
Session.Send(synchronizationEndEventMessage);
m_objectsSynchronized = -1;
}
}
}
// 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)
// {
// String typeName = ToOmType(primShape.PCode);
// m_log.Info("[MXP ClientStack] Transmitting Primitive" + typeName);
//
// PerceptionEventMessage pe = new PerceptionEventMessage();
// pe.ObjectFragment.ObjectId = objectID.Guid;
//
// pe.ObjectFragment.ParentObjectId = Guid.Empty;
//
// // Resolving parent UUID.
// OpenSim.Region.Framework.Scenes.Scene scene = (OpenSim.Region.Framework.Scenes.Scene)Scene;
// if (scene.Entities.ContainsKey(parentID))
// {
// pe.ObjectFragment.ParentObjectId = scene.Entities[parentID].UUID.Guid;
// }
//
// pe.ObjectFragment.ObjectIndex = localID;
// pe.ObjectFragment.ObjectName = typeName + " Object";
// pe.ObjectFragment.OwnerId = ownerID.Guid;
// pe.ObjectFragment.TypeId = Guid.Empty;
// pe.ObjectFragment.TypeName = typeName;
// pe.ObjectFragment.Acceleration = ToOmVector(acc);
// pe.ObjectFragment.AngularAcceleration=new MsdQuaternion4f();
// pe.ObjectFragment.AngularVelocity = ToOmQuaternion(rvel);
// pe.ObjectFragment.BoundingSphereRadius = primShape.Scale.Length();
//
// pe.ObjectFragment.Location = ToOmVector(pos);
//
// pe.ObjectFragment.Mass = 1.0f;
// pe.ObjectFragment.Orientation = ToOmQuaternion(rotation);
// pe.ObjectFragment.Velocity =ToOmVector(vel);
//
// OmSlPrimitiveExt ext = new OmSlPrimitiveExt();
//
// if (!((primShape.PCode == (byte)PCode.NewTree) || (primShape.PCode == (byte)PCode.Tree) || (primShape.PCode == (byte)PCode.Grass)))
// {
//
// ext.PathBegin = primShape.PathBegin;
// ext.PathEnd = primShape.PathEnd;
// ext.PathScaleX = primShape.PathScaleX;
// ext.PathScaleY = primShape.PathScaleY;
// ext.PathShearX = primShape.PathShearX;
// ext.PathShearY = primShape.PathShearY;
// ext.PathSkew = primShape.PathSkew;
// ext.ProfileBegin = primShape.ProfileBegin;
// ext.ProfileEnd = primShape.ProfileEnd;
// ext.PathCurve = primShape.PathCurve;
// ext.ProfileCurve = primShape.ProfileCurve;
// ext.ProfileHollow = primShape.ProfileHollow;
// ext.PathRadiusOffset = primShape.PathRadiusOffset;
// ext.PathRevolutions = primShape.PathRevolutions;
// ext.PathTaperX = primShape.PathTaperX;
// ext.PathTaperY = primShape.PathTaperY;
// ext.PathTwist = primShape.PathTwist;
// ext.PathTwistBegin = primShape.PathTwistBegin;
//
//
// }
//
// ext.UpdateFlags = flags;
// ext.ExtraParams = primShape.ExtraParams;
// ext.State = primShape.State;
// ext.TextureEntry = primShape.TextureEntry;
// ext.TextureAnim = textureanim;
// ext.Scale = ToOmVector(primShape.Scale);
// ext.Text = text;
// ext.TextColor = ToOmColor(textColor);
// ext.PSBlock = particleSystem;
// ext.ClickAction = clickAction;
// ext.Material = material;
//
// pe.SetExtension<OmSlPrimitiveExt>(ext);
//
// Session.Send(pe);
//
// if (m_objectsSynchronized != -1)
// {
// m_objectsSynchronized++;
//
// if (m_objectsToSynchronize >= m_objectsSynchronized)
// {
// SynchronizationEndEventMessage synchronizationEndEventMessage = new SynchronizationEndEventMessage();
// Session.Send(synchronizationEndEventMessage);
// m_objectsSynchronized = -1;
// }
// }
// }
public void MXPSendAvatarData(string participantName, UUID ownerID, UUID parentId, UUID avatarID, uint avatarLocalID, Vector3 position, Quaternion rotation)
{

5
OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim.Client.MXP.PacketHandler
private readonly IList<MXPClientView> m_sessionsToRemove = new List<MXPClientView>();
private readonly int m_port;
private readonly bool m_accountsAuthenticate;
// private readonly bool m_accountsAuthenticate;
private readonly String m_programName;
private readonly byte m_programMajorVersion;
@ -76,7 +76,7 @@ namespace OpenSim.Client.MXP.PacketHandler
public MXPPacketServer(int port, Dictionary<UUID, Scene> scenes, bool accountsAuthenticate)
{
m_port = port;
m_accountsAuthenticate = accountsAuthenticate;
// m_accountsAuthenticate = accountsAuthenticate;
m_scenes = scenes;
@ -491,7 +491,6 @@ namespace OpenSim.Client.MXP.PacketHandler
public bool AuthoriseUser(string participantName, string password, UUID sceneId, out UserAccount account)
{
UUID userId = UUID.Zero;
string firstName = "";
string lastName = "";
account = null;

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*