ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

* This updates LibOMV to the current release 0.6.0 on March 19 2009

Browse Source 
* Important:  HttpServer.dll was changed to HttpServer_OpenSim.dll so that the HttpServer references do not conflict if you've copied the OpenMetaverse.Http.dll and requirements to the OpenSimulator bin folder.
This means that if you reference HttpServer.dll in any projects, you will need to change the reference to HttpServer_OpenSim.dll.   It still uses the Same HttpServer namespace though.
This commit is contained in:
Teravus Ovares
2009-03-27 22:13:09 +00:00
parent 30ffefb67b
commit 52c482a7a7
22 changed files with 7044 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -815,7 +815,7 @@ namespace OpenSim.Client.MXP.ClientStack
{
visualParams.Add(visualParam);
}
OnSetAppearance(appearance.Texture.ToBytes(), visualParams);
OnSetAppearance(appearance.Texture.GetBytes(), visualParams);
}
public void Stop()

2
OpenSim/Data/MSSQL/MSSQLUserData.cs
View File

@@ -597,7 +597,7 @@ namespace OpenSim.Data.MSSQL
cmd.Parameters.Add(database.CreateParameter("@owner", appearance.Owner));
cmd.Parameters.Add(database.CreateParameter("@serial", appearance.Serial));
cmd.Parameters.Add(database.CreateParameter("@visual_params", appearance.VisualParams));
cmd.Parameters.Add(database.CreateParameter("@texture", appearance.Texture.ToBytes()));
cmd.Parameters.Add(database.CreateParameter("@texture", appearance.Texture.GetBytes()));
cmd.Parameters.Add(database.CreateParameter("@avatar_height", appearance.AvatarHeight));
cmd.Parameters.Add(database.CreateParameter("@body_item", appearance.BodyItem));
cmd.Parameters.Add(database.CreateParameter("@body_asset", appearance.BodyAsset));

2
OpenSim/Data/MySQL/MySQLManager.cs
View File

@@ -1171,7 +1171,7 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("?owner", appearance.Owner.ToString());
cmd.Parameters.AddWithValue("?serial", appearance.Serial);
cmd.Parameters.AddWithValue("?visual_params", appearance.VisualParams);
cmd.Parameters.AddWithValue("?texture", appearance.Texture.ToBytes());
cmd.Parameters.AddWithValue("?texture", appearance.Texture.GetBytes());
cmd.Parameters.AddWithValue("?avatar_height", appearance.AvatarHeight);
cmd.Parameters.AddWithValue("?body_item", appearance.BodyItem.ToString());
cmd.Parameters.AddWithValue("?body_asset", appearance.BodyAsset.ToString());

4
OpenSim/Data/NHibernate/TextureUserType.cs
View File

@@ -57,7 +57,7 @@ namespace OpenSim.Data.NHibernate
}
else
{
byte[] bytes = ((Primitive.TextureEntry)texture).ToBytes();
byte[] bytes = ((Primitive.TextureEntry)texture).GetBytes();
return new Primitive.TextureEntry(bytes, 0, bytes.Length);
}
}
@@ -94,7 +94,7 @@ namespace OpenSim.Data.NHibernate
public void NullSafeSet(IDbCommand cmd, object obj, int index)
{
Primitive.TextureEntry texture = (Primitive.TextureEntry)obj;
((IDataParameter)cmd.Parameters[index]).Value = texture.ToBytes();
((IDataParameter)cmd.Parameters[index]).Value = texture.GetBytes();
}
public object Replace(object original, object target, object owner)

2
OpenSim/Framework/AvatarAppearance.cs
View File

@@ -386,7 +386,7 @@ namespace OpenSim.Framework
h["owner"] = Owner.ToString();
h["serial"] = Serial.ToString();
h["visual_params"] = VisualParams;
h["texture"] = Texture.ToBytes();
h["texture"] = Texture.GetBytes();
h["avatar_height"] = AvatarHeight.ToString();
h["body_item"] = BodyItem.ToString();
h["body_asset"] = BodyAsset.ToString();

2
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@@ -201,7 +201,7 @@ namespace OpenSim.Framework
return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length);
}
set { m_textureEntry = value.ToBytes(); }
set { m_textureEntry = value.GetBytes(); }
}
public byte[] TextureEntry

4
OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
View File

@@ -74,8 +74,8 @@ namespace OpenSim.Grid.UserServer.Modules
private BaseHttpServer m_httpServer;
private BlockingQueue<PresenceNotification> m_NotifyQueue =
new BlockingQueue<PresenceNotification>();
private OpenSim.Framework.BlockingQueue<PresenceNotification> m_NotifyQueue =
new OpenSim.Framework.BlockingQueue<PresenceNotification>();
Thread m_NotifyThread;

4
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@@ -3716,7 +3716,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
objdata.TextureAnim = new byte[0];
objdata.Sound = UUID.Zero;
Primitive.TextureEntry ntex = new Primitive.TextureEntry(new UUID("00000000-0000-0000-5005-000000000005"));
objdata.TextureEntry = ntex.ToBytes();
objdata.TextureEntry = ntex.GetBytes();
objdata.State = 0;
objdata.Data = new byte[0];
@@ -7556,7 +7556,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
shape.PathTwist = addPacket.ObjectData.PathTwist;
shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
Primitive.TextureEntry ntex = new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f"));
shape.TextureEntry = ntex.ToBytes();
shape.TextureEntry = ntex.GetBytes();
//shape.Textures = ntex;
return shape;
}

2
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -3532,7 +3532,7 @@ if (m_shape != null) {
//tmpcolor.G = tmpcolor.G*255;
//tmpcolor.B = tmpcolor.B*255;
//tex.DefaultTexture.RGBA = tmpcolor;
UpdateTextureEntry(tex.ToBytes());
UpdateTextureEntry(tex.GetBytes());
}
/// <summary>

16
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -2236,7 +2236,7 @@ namespace OpenSim.Region.Framework.Scenes
pos.Z -= m_appearance.HipOffset;
remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid,
LocalId, m_pos, m_appearance.Texture.ToBytes(),
LocalId, m_pos, m_appearance.Texture.GetBytes(),
m_parentID, rot);
if (m_sitStatus)
GenerateRandomAnimation();
@@ -2315,7 +2315,7 @@ namespace OpenSim.Region.Framework.Scenes
pos.Z -= m_appearance.HipOffset;
m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId,
m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot);
m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot);
if (!m_isChildAgent)
{
@@ -2360,7 +2360,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SendAppearanceToOtherAgent(ScenePresence avatar)
{
avatar.ControllingClient.SendAppearance(
m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.ToBytes());
m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.GetBytes());
}
/// <summary>
@@ -2392,7 +2392,7 @@ namespace OpenSim.Region.Framework.Scenes
Quaternion rot = m_bodyRot;
m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId,
m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot);
m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot);
}
@@ -2801,7 +2801,7 @@ namespace OpenSim.Region.Framework.Scenes
cAgent.VisualParams = m_appearance.VisualParams;
if (m_appearance.Texture != null)
cAgent.AgentTextures = m_appearance.Texture.ToBytes();
cAgent.AgentTextures = m_appearance.Texture.GetBytes();
}
catch (Exception e)
{
@@ -2863,7 +2863,7 @@ namespace OpenSim.Region.Framework.Scenes
if (cAgent.AgentTextures != null)
te = cAgent.AgentTextures;
else
te = AvatarAppearance.GetDefaultTexture().ToBytes();
te = AvatarAppearance.GetDefaultTexture().GetBytes();
if ((cAgent.VisualParams == null) || (cAgent.VisualParams.Length < AvatarAppearance.VISUALPARAM_COUNT))
cAgent.VisualParams = AvatarAppearance.GetDefaultVisualParams();
m_appearance.SetAppearance(te, new List<byte>(cAgent.VisualParams));
@@ -2937,7 +2937,7 @@ namespace OpenSim.Region.Framework.Scenes
static ScenePresence()
{
Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
DefaultTexture = textu.ToBytes();
DefaultTexture = textu.GetBytes();
}
@@ -3076,7 +3076,7 @@ namespace OpenSim.Region.Framework.Scenes
if (DefaultTexture == null)
{
Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
DefaultTexture = textu.ToBytes();
DefaultTexture = textu.GetBytes();
}
if (DateTime.Now.Month==4&&DateTime.Now.Day==1)
m_sitStatus = true;

2
OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
View File

@@ -261,7 +261,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
texcolor = tex.DefaultTexture.RGBA;
texcolor.A = transparencyAmount;
tex.DefaultTexture.RGBA = texcolor;
part.Shape.TextureEntry = tex.ToBytes();
part.Shape.TextureEntry = tex.GetBytes();
}
catch (Exception)
{

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -5051,7 +5051,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
flags |= ScriptBaseClass.AGENT_MOUSELOOK;
}
if ((agent.State & (byte)AgentManager.AgentState.Typing) != (byte)0)
if ((agent.State & (byte)AgentState.Typing) != (byte)0)
{
flags |= ScriptBaseClass.AGENT_TYPING;
}

BIN
bin/HttpServer.dll
View File

Binary file not shown.

BIN
bin/HttpServer_OpenSim.dll Normal file
View File

Binary file not shown.

7019
bin/HttpServer_OpenSim.xml Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
bin/OpenMetaverse.StructuredData.dll
View File

Binary file not shown.

BIN
bin/OpenMetaverse.dll
View File

Binary file not shown.

2
bin/OpenMetaverse.dll.config
View File

@@ -1,5 +1,5 @@
<configuration>
<dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1" />
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
</configuration>

BIN
bin/OpenMetaverseTypes.dll
View File

Binary file not shown.

BIN
bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so Normal file
View File

Binary file not shown.

BIN
bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
View File

Binary file not shown.

4
prebuild.xml
View File

@@ -333,7 +333,7 @@
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="XMLRPC.dll"/>
<Reference name="log4net.dll"/>
<Reference name="HttpServer.dll"/>
<Reference name="HttpServer_OpenSim.dll"/>
<Files>
<Match pattern="*.cs" recurse="true">
@@ -2912,7 +2912,7 @@
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="log4net.dll"/>
<Reference name="HttpServer.dll"/>
<Reference name="HttpServer_OpenSim.dll"/>
<Reference name="nunit.framework.dll" />
<Files>