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

Update svn properties.

0.6.5-rc1
Jeff Ames 2009-04-06 14:24:13 +00:00
parent 2a5d38a580
commit 5f34bd73fb
10 changed files with 1014 additions and 1014 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
OpenSim/Framework/Animation.cs
View File

@ -1,94 +1,94 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
[Serializable] [Serializable]
public class Animation public class Animation
{ {
private UUID animID; private UUID animID;
public UUID AnimID public UUID AnimID
{ {
get { return animID; } get { return animID; }
set { animID = value; } set { animID = value; }
} }
private int sequenceNum; private int sequenceNum;
public int SequenceNum public int SequenceNum
{ {
get { return sequenceNum; } get { return sequenceNum; }
set { sequenceNum = value; } set { sequenceNum = value; }
} }
private UUID objectID; private UUID objectID;
public UUID ObjectID public UUID ObjectID
{ {
get { return objectID; } get { return objectID; }
set { objectID = value; } set { objectID = value; }
} }
public Animation() public Animation()
{ {
} }
public Animation(UUID animID, int sequenceNum, UUID objectID) public Animation(UUID animID, int sequenceNum, UUID objectID)
{ {
this.animID = animID; this.animID = animID;
this.sequenceNum = sequenceNum; this.sequenceNum = sequenceNum;
this.objectID = objectID; this.objectID = objectID;
} }
public Animation(OSDMap args) public Animation(OSDMap args)
{ {
UnpackUpdateMessage(args); UnpackUpdateMessage(args);
} }
public OSDMap PackUpdateMessage() public OSDMap PackUpdateMessage()
{ {
OSDMap anim = new OSDMap(); OSDMap anim = new OSDMap();
anim["animation"] = OSD.FromUUID(animID); anim["animation"] = OSD.FromUUID(animID);
anim["object_id"] = OSD.FromUUID(objectID); anim["object_id"] = OSD.FromUUID(objectID);
anim["seq_num"] = OSD.FromInteger(sequenceNum); anim["seq_num"] = OSD.FromInteger(sequenceNum);
return anim; return anim;
} }
public void UnpackUpdateMessage(OSDMap args) public void UnpackUpdateMessage(OSDMap args)
{ {
if (args["animation"] != null) if (args["animation"] != null)
animID = args["animation"].AsUUID(); animID = args["animation"].AsUUID();
if (args["object_id"] != null) if (args["object_id"] != null)
objectID = args["object_id"].AsUUID(); objectID = args["object_id"].AsUUID();
if (args["seq_num"] != null) if (args["seq_num"] != null)
sequenceNum = args["seq_num"].AsInteger(); sequenceNum = args["seq_num"].AsInteger();
} }
} }
} }

1262
OpenSim/Framework/Communications/Clients/RegionClient.cs
View File

File diff suppressed because it is too large Load Diff

84
OpenSim/Framework/ISceneObject.cs
View File

@ -1,42 +1,42 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the * * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
public interface ISceneObject public interface ISceneObject
{ {
UUID UUID { get; } UUID UUID { get; }
ISceneObject CloneForNewScene(); ISceneObject CloneForNewScene();
string ToXmlString2(); string ToXmlString2();
string ExtraToXmlString(); string ExtraToXmlString();
void ExtraFromXmlString(string xmlstr); void ExtraFromXmlString(string xmlstr);
string GetStateSnapshot(); string GetStateSnapshot();
void SetState(string xmlstr, UUID regionID); void SetState(string xmlstr, UUID regionID);
} }
} }

144
OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs
View File

@ -1,72 +1,72 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
using System.Timers; using System.Timers;
using Nini.Config; using Nini.Config;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.OptionalModules.Autooar namespace OpenSim.Region.OptionalModules.Autooar
{ {
public class AutooarModule : IRegionModule public class AutooarModule : IRegionModule
{ {
private readonly Timer m_timer = new Timer(60000*20); private readonly Timer m_timer = new Timer(60000*20);
private readonly List<Scene> m_scenes = new List<Scene>(); private readonly List<Scene> m_scenes = new List<Scene>();
private IConfigSource config; private IConfigSource config;
private bool m_enabled = false; private bool m_enabled = false;
public void Initialise(Scene scene, IConfigSource source) public void Initialise(Scene scene, IConfigSource source)
{ {
m_scenes.Add(scene); m_scenes.Add(scene);
config = source; config = source;
} }
public void PostInitialise() public void PostInitialise()
{ {
if(config.Configs["autooar"] != null) if(config.Configs["autooar"] != null)
{ {
m_enabled = config.Configs["autooar"].GetBoolean("Enabled", m_enabled); m_enabled = config.Configs["autooar"].GetBoolean("Enabled", m_enabled);
} }
if(m_enabled) if(m_enabled)
{ {
m_timer.Elapsed += m_timer_Elapsed; m_timer.Elapsed += m_timer_Elapsed;
m_timer.AutoReset = true; m_timer.AutoReset = true;
m_timer.Start(); m_timer.Start();
} }
} }
void m_timer_Elapsed(object sender, ElapsedEventArgs e) void m_timer_Elapsed(object sender, ElapsedEventArgs e)
{ {
if (!Directory.Exists("autooars")) if (!Directory.Exists("autooars"))
Directory.CreateDirectory("autooars"); Directory.CreateDirectory("autooars");
foreach (Scene scene in m_scenes) foreach (Scene scene in m_scenes)
{ {
IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
archiver.ArchiveRegion(Path.Combine("autooars", archiver.ArchiveRegion(Path.Combine("autooars",
scene.RegionInfo.RegionName + "_" + scene.RegionInfo.RegionLocX + scene.RegionInfo.RegionName + "_" + scene.RegionInfo.RegionLocX +
"x" + scene.RegionInfo.RegionLocY + ".oar.tar.gz")); "x" + scene.RegionInfo.RegionLocY + ".oar.tar.gz"));
} }
} }
public void Close() public void Close()
{ {
if (m_timer.Enabled) if (m_timer.Enabled)
m_timer.Stop(); m_timer.Stop();
} }
public string Name public string Name
{ {
get { return "Automatic OAR Module"; } get { return "Automatic OAR Module"; }
} }
public bool IsSharedModule public bool IsSharedModule
{ {
get { return true; } get { return true; }
} }
} }
} }

30
OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs
View File

@ -1,15 +1,15 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{ {
public interface IParcel public interface IParcel
{ {
string Name { get; set; } string Name { get; set; }
string Description { get; set; } string Description { get; set; }
ISocialEntity Owner { get; set; } ISocialEntity Owner { get; set; }
bool[,] Bitmap { get; } bool[,] Bitmap { get; }
} }
} }

58
OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs
View File

@ -1,29 +1,29 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{ {
interface IPersistence interface IPersistence
{ {
T Get<T>(Guid storageID); T Get<T>(Guid storageID);
T Get<T>(); T Get<T>();
/// <summary> /// <summary>
/// Stores 'data' into the persistence system /// Stores 'data' into the persistence system
/// associated with this object, however saved /// associated with this object, however saved
/// under the ID 'storageID'. This data may /// under the ID 'storageID'. This data may
/// be accessed by other scripts however. /// be accessed by other scripts however.
/// </summary> /// </summary>
/// <param name="storageID"></param> /// <param name="storageID"></param>
/// <param name="data"></param> /// <param name="data"></param>
void Put<T>(Guid storageID, T data); void Put<T>(Guid storageID, T data);
/// <summary> /// <summary>
/// Stores 'data' into the persistence system /// Stores 'data' into the persistence system
/// using the default ID for this script. /// using the default ID for this script.
/// </summary> /// </summary>
/// <param name="data"></param> /// <param name="data"></param>
void Put<T>(T data); void Put<T>(T data);
} }
} }

26
OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs
View File

@ -1,14 +1,14 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{ {
public interface ISocialEntity public interface ISocialEntity
{ {
UUID GlobalID { get; } UUID GlobalID { get; }
string Name { get; } string Name { get; }
bool IsUser { get; } bool IsUser { get; }
} }
} }

90
OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
View File

@ -1,45 +1,45 @@
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{ {
class LOParcel : IParcel class LOParcel : IParcel
{ {
private readonly Scene m_scene; private readonly Scene m_scene;
private readonly int m_parcelID; private readonly int m_parcelID;
public LOParcel(Scene m_scene, int m_parcelID) public LOParcel(Scene m_scene, int m_parcelID)
{ {
this.m_scene = m_scene; this.m_scene = m_scene;
this.m_parcelID = m_parcelID; this.m_parcelID = m_parcelID;
} }
private ILandObject GetLO() private ILandObject GetLO()
{ {
return m_scene.LandChannel.GetLandObject(m_parcelID); return m_scene.LandChannel.GetLandObject(m_parcelID);
} }
public string Name public string Name
{ {
get { return GetLO().landData.Name; } get { return GetLO().landData.Name; }
set { GetLO().landData.Name = value; } set { GetLO().landData.Name = value; }
} }
public string Description public string Description
{ {
get { return GetLO().landData.Description; } get { return GetLO().landData.Description; }
set { GetLO().landData.Description = value; } set { GetLO().landData.Description = value; }
} }
public ISocialEntity Owner public ISocialEntity Owner
{ {
get { throw new System.NotImplementedException(); } get { throw new System.NotImplementedException(); }
set { throw new System.NotImplementedException(); } set { throw new System.NotImplementedException(); }
} }
public bool[,] Bitmap public bool[,] Bitmap
{ {
get { return GetLO().landBitmap; } get { return GetLO().landBitmap; }
} }
} }
} }

78
OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectPhysics.cs
View File

@ -1,39 +1,39 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object
{ {
/// <summary> /// <summary>
/// This implements an interface similar to that provided by physics engines to OpenSim internally. /// This implements an interface similar to that provided by physics engines to OpenSim internally.
/// Eg, PhysicsActor. It is capable of setting and getting properties related to the current /// Eg, PhysicsActor. It is capable of setting and getting properties related to the current
/// physics scene representation of this object. /// physics scene representation of this object.
/// </summary> /// </summary>
public interface IObjectPhysics public interface IObjectPhysics
{ {
bool Enabled { get; set; } bool Enabled { get; set; }
bool Phantom { get; set; } bool Phantom { get; set; }
bool PhantomCollisions { get; set; } bool PhantomCollisions { get; set; }
double Density { get; set; } double Density { get; set; }
double Mass { get; set; } double Mass { get; set; }
double Buoyancy { get; set; } double Buoyancy { get; set; }
Vector3 GeometricCenter { get; } Vector3 GeometricCenter { get; }
Vector3 CenterOfMass { get; } Vector3 CenterOfMass { get; }
Vector3 RotationalVelocity { get; set; } Vector3 RotationalVelocity { get; set; }
Vector3 Velocity { get; set; } Vector3 Velocity { get; set; }
Vector3 Torque { get; set; } Vector3 Torque { get; set; }
Vector3 Acceleration { get; } Vector3 Acceleration { get; }
Vector3 Force { get; set; } Vector3 Force { get; set; }
bool FloatOnWater { set; } bool FloatOnWater { set; }
void AddForce(Vector3 force, bool pushforce); void AddForce(Vector3 force, bool pushforce);
void AddAngularForce(Vector3 force, bool pushforce); void AddAngularForce(Vector3 force, bool pushforce);
void SetMomentum(Vector3 momentum); void SetMomentum(Vector3 momentum);
} }
} }

68
OpenSim/Region/OptionalModules/Scripting/Minimodule/SEUser.cs
View File

@ -1,34 +1,34 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{ {
class SEUser : ISocialEntity class SEUser : ISocialEntity
{ {
private readonly UUID m_uuid; private readonly UUID m_uuid;
private readonly string m_name; private readonly string m_name;
public SEUser(UUID uuid, string name) public SEUser(UUID uuid, string name)
{ {
m_uuid = uuid; m_uuid = uuid;
m_name = name; m_name = name;
} }
public UUID GlobalID public UUID GlobalID
{ {
get { return m_uuid; } get { return m_uuid; }
} }
public string Name public string Name
{ {
get { return m_name; } get { return m_name; }
} }
public bool IsUser public bool IsUser
{ {
get { return true; } get { return true; }
} }
} }
} }