aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2009-04-06 14:24:13 +0000
committerJeff Ames2009-04-06 14:24:13 +0000
commit5f34bd73fbca765064c4b3811d1f67da36cbf5ae (patch)
treea91d8995b5677a524038e8b43c168ac2a28dd2c4 /OpenSim/Region
parentThank you, Intimidated, for a patch too fix the movement animation handling (diff)
downloadopensim-SC-5f34bd73fbca765064c4b3811d1f67da36cbf5ae.zip
opensim-SC-5f34bd73fbca765064c4b3811d1f67da36cbf5ae.tar.gz
opensim-SC-5f34bd73fbca765064c4b3811d1f67da36cbf5ae.tar.bz2
opensim-SC-5f34bd73fbca765064c4b3811d1f67da36cbf5ae.tar.xz
Update svn properties.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs144
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs30
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs58
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs26
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs90
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectPhysics.cs78
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SEUser.cs68
7 files changed, 247 insertions, 247 deletions
diff --git a/OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs b/OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs
index 6c10928..580c8e1 100644
--- a/OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs
+++ b/OpenSim/Region/OptionalModules/Autooar/AutooarModule.cs
@@ -1,72 +1,72 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.IO; 3using System.IO;
4using System.Text; 4using System.Text;
5using System.Timers; 5using System.Timers;
6using Nini.Config; 6using Nini.Config;
7using OpenSim.Region.Framework.Interfaces; 7using OpenSim.Region.Framework.Interfaces;
8using OpenSim.Region.Framework.Scenes; 8using OpenSim.Region.Framework.Scenes;
9 9
10namespace OpenSim.Region.OptionalModules.Autooar 10namespace OpenSim.Region.OptionalModules.Autooar
11{ 11{
12 public class AutooarModule : IRegionModule 12 public class AutooarModule : IRegionModule
13 { 13 {
14 private readonly Timer m_timer = new Timer(60000*20); 14 private readonly Timer m_timer = new Timer(60000*20);
15 private readonly List<Scene> m_scenes = new List<Scene>(); 15 private readonly List<Scene> m_scenes = new List<Scene>();
16 private IConfigSource config; 16 private IConfigSource config;
17 private bool m_enabled = false; 17 private bool m_enabled = false;
18 18
19 19
20 public void Initialise(Scene scene, IConfigSource source) 20 public void Initialise(Scene scene, IConfigSource source)
21 { 21 {
22 m_scenes.Add(scene); 22 m_scenes.Add(scene);
23 config = source; 23 config = source;
24 } 24 }
25 25
26 public void PostInitialise() 26 public void PostInitialise()
27 { 27 {
28 if(config.Configs["autooar"] != null) 28 if(config.Configs["autooar"] != null)
29 { 29 {
30 m_enabled = config.Configs["autooar"].GetBoolean("Enabled", m_enabled); 30 m_enabled = config.Configs["autooar"].GetBoolean("Enabled", m_enabled);
31 } 31 }
32 32
33 if(m_enabled) 33 if(m_enabled)
34 { 34 {
35 m_timer.Elapsed += m_timer_Elapsed; 35 m_timer.Elapsed += m_timer_Elapsed;
36 m_timer.AutoReset = true; 36 m_timer.AutoReset = true;
37 m_timer.Start(); 37 m_timer.Start();
38 } 38 }
39 } 39 }
40 40
41 void m_timer_Elapsed(object sender, ElapsedEventArgs e) 41 void m_timer_Elapsed(object sender, ElapsedEventArgs e)
42 { 42 {
43 if (!Directory.Exists("autooars")) 43 if (!Directory.Exists("autooars"))
44 Directory.CreateDirectory("autooars"); 44 Directory.CreateDirectory("autooars");
45 45
46 foreach (Scene scene in m_scenes) 46 foreach (Scene scene in m_scenes)
47 { 47 {
48 IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); 48 IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
49 49
50 archiver.ArchiveRegion(Path.Combine("autooars", 50 archiver.ArchiveRegion(Path.Combine("autooars",
51 scene.RegionInfo.RegionName + "_" + scene.RegionInfo.RegionLocX + 51 scene.RegionInfo.RegionName + "_" + scene.RegionInfo.RegionLocX +
52 "x" + scene.RegionInfo.RegionLocY + ".oar.tar.gz")); 52 "x" + scene.RegionInfo.RegionLocY + ".oar.tar.gz"));
53 } 53 }
54 } 54 }
55 55
56 public void Close() 56 public void Close()
57 { 57 {
58 if (m_timer.Enabled) 58 if (m_timer.Enabled)
59 m_timer.Stop(); 59 m_timer.Stop();
60 } 60 }
61 61
62 public string Name 62 public string Name
63 { 63 {
64 get { return "Automatic OAR Module"; } 64 get { return "Automatic OAR Module"; }
65 } 65 }
66 66
67 public bool IsSharedModule 67 public bool IsSharedModule
68 { 68 {
69 get { return true; } 69 get { return true; }
70 } 70 }
71 } 71 }
72} 72}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs
index 2a973a9..2849f16 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IParcel.cs
@@ -1,15 +1,15 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenMetaverse; 4using OpenMetaverse;
5 5
6namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 6namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
7{ 7{
8 public interface IParcel 8 public interface IParcel
9 { 9 {
10 string Name { get; set; } 10 string Name { get; set; }
11 string Description { get; set; } 11 string Description { get; set; }
12 ISocialEntity Owner { get; set; } 12 ISocialEntity Owner { get; set; }
13 bool[,] Bitmap { get; } 13 bool[,] Bitmap { get; }
14 } 14 }
15} 15}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs
index e433c11..c093880 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IPersistence.cs
@@ -1,29 +1,29 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 5namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
6{ 6{
7 interface IPersistence 7 interface IPersistence
8 { 8 {
9 T Get<T>(Guid storageID); 9 T Get<T>(Guid storageID);
10 T Get<T>(); 10 T Get<T>();
11 11
12 /// <summary> 12 /// <summary>
13 /// Stores 'data' into the persistence system 13 /// Stores 'data' into the persistence system
14 /// associated with this object, however saved 14 /// associated with this object, however saved
15 /// under the ID 'storageID'. This data may 15 /// under the ID 'storageID'. This data may
16 /// be accessed by other scripts however. 16 /// be accessed by other scripts however.
17 /// </summary> 17 /// </summary>
18 /// <param name="storageID"></param> 18 /// <param name="storageID"></param>
19 /// <param name="data"></param> 19 /// <param name="data"></param>
20 void Put<T>(Guid storageID, T data); 20 void Put<T>(Guid storageID, T data);
21 21
22 /// <summary> 22 /// <summary>
23 /// Stores 'data' into the persistence system 23 /// Stores 'data' into the persistence system
24 /// using the default ID for this script. 24 /// using the default ID for this script.
25 /// </summary> 25 /// </summary>
26 /// <param name="data"></param> 26 /// <param name="data"></param>
27 void Put<T>(T data); 27 void Put<T>(T data);
28 } 28 }
29} 29}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs
index 0833ffd..cc664eb 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ISocialEntity.cs
@@ -1,14 +1,14 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenMetaverse; 4using OpenMetaverse;
5 5
6namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 6namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
7{ 7{
8 public interface ISocialEntity 8 public interface ISocialEntity
9 { 9 {
10 UUID GlobalID { get; } 10 UUID GlobalID { get; }
11 string Name { get; } 11 string Name { get; }
12 bool IsUser { get; } 12 bool IsUser { get; }
13 } 13 }
14} \ No newline at end of file 14} \ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
index aceeacc..8ab1a56 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
@@ -1,45 +1,45 @@
1using OpenSim.Region.Framework.Interfaces; 1using OpenSim.Region.Framework.Interfaces;
2using OpenSim.Region.Framework.Scenes; 2using OpenSim.Region.Framework.Scenes;
3 3
4namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 4namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
5{ 5{
6 class LOParcel : IParcel 6 class LOParcel : IParcel
7 { 7 {
8 private readonly Scene m_scene; 8 private readonly Scene m_scene;
9 private readonly int m_parcelID; 9 private readonly int m_parcelID;
10 10
11 public LOParcel(Scene m_scene, int m_parcelID) 11 public LOParcel(Scene m_scene, int m_parcelID)
12 { 12 {
13 this.m_scene = m_scene; 13 this.m_scene = m_scene;
14 this.m_parcelID = m_parcelID; 14 this.m_parcelID = m_parcelID;
15 } 15 }
16 16
17 private ILandObject GetLO() 17 private ILandObject GetLO()
18 { 18 {
19 return m_scene.LandChannel.GetLandObject(m_parcelID); 19 return m_scene.LandChannel.GetLandObject(m_parcelID);
20 } 20 }
21 21
22 public string Name 22 public string Name
23 { 23 {
24 get { return GetLO().landData.Name; } 24 get { return GetLO().landData.Name; }
25 set { GetLO().landData.Name = value; } 25 set { GetLO().landData.Name = value; }
26 } 26 }
27 27
28 public string Description 28 public string Description
29 { 29 {
30 get { return GetLO().landData.Description; } 30 get { return GetLO().landData.Description; }
31 set { GetLO().landData.Description = value; } 31 set { GetLO().landData.Description = value; }
32 } 32 }
33 33
34 public ISocialEntity Owner 34 public ISocialEntity Owner
35 { 35 {
36 get { throw new System.NotImplementedException(); } 36 get { throw new System.NotImplementedException(); }
37 set { throw new System.NotImplementedException(); } 37 set { throw new System.NotImplementedException(); }
38 } 38 }
39 39
40 public bool[,] Bitmap 40 public bool[,] Bitmap
41 { 41 {
42 get { return GetLO().landBitmap; } 42 get { return GetLO().landBitmap; }
43 } 43 }
44 } 44 }
45} 45}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectPhysics.cs
index 6ca4e5f..3682e9b 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectPhysics.cs
@@ -1,39 +1,39 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenMetaverse; 4using OpenMetaverse;
5 5
6namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object 6namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object
7{ 7{
8 /// <summary> 8 /// <summary>
9 /// This implements an interface similar to that provided by physics engines to OpenSim internally. 9 /// This implements an interface similar to that provided by physics engines to OpenSim internally.
10 /// Eg, PhysicsActor. It is capable of setting and getting properties related to the current 10 /// Eg, PhysicsActor. It is capable of setting and getting properties related to the current
11 /// physics scene representation of this object. 11 /// physics scene representation of this object.
12 /// </summary> 12 /// </summary>
13 public interface IObjectPhysics 13 public interface IObjectPhysics
14 { 14 {
15 bool Enabled { get; set; } 15 bool Enabled { get; set; }
16 16
17 bool Phantom { get; set; } 17 bool Phantom { get; set; }
18 bool PhantomCollisions { get; set; } 18 bool PhantomCollisions { get; set; }
19 19
20 double Density { get; set; } 20 double Density { get; set; }
21 double Mass { get; set; } 21 double Mass { get; set; }
22 double Buoyancy { get; set; } 22 double Buoyancy { get; set; }
23 23
24 Vector3 GeometricCenter { get; } 24 Vector3 GeometricCenter { get; }
25 Vector3 CenterOfMass { get; } 25 Vector3 CenterOfMass { get; }
26 26
27 Vector3 RotationalVelocity { get; set; } 27 Vector3 RotationalVelocity { get; set; }
28 Vector3 Velocity { get; set; } 28 Vector3 Velocity { get; set; }
29 Vector3 Torque { get; set; } 29 Vector3 Torque { get; set; }
30 Vector3 Acceleration { get; } 30 Vector3 Acceleration { get; }
31 Vector3 Force { get; set; } 31 Vector3 Force { get; set; }
32 32
33 bool FloatOnWater { set; } 33 bool FloatOnWater { set; }
34 34
35 void AddForce(Vector3 force, bool pushforce); 35 void AddForce(Vector3 force, bool pushforce);
36 void AddAngularForce(Vector3 force, bool pushforce); 36 void AddAngularForce(Vector3 force, bool pushforce);
37 void SetMomentum(Vector3 momentum); 37 void SetMomentum(Vector3 momentum);
38 } 38 }
39} 39}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SEUser.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SEUser.cs
index a35e051..a7da114 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SEUser.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SEUser.cs
@@ -1,34 +1,34 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenMetaverse; 4using OpenMetaverse;
5 5
6namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 6namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
7{ 7{
8 class SEUser : ISocialEntity 8 class SEUser : ISocialEntity
9 { 9 {
10 private readonly UUID m_uuid; 10 private readonly UUID m_uuid;
11 private readonly string m_name; 11 private readonly string m_name;
12 12
13 public SEUser(UUID uuid, string name) 13 public SEUser(UUID uuid, string name)
14 { 14 {
15 m_uuid = uuid; 15 m_uuid = uuid;
16 m_name = name; 16 m_name = name;
17 } 17 }
18 18
19 public UUID GlobalID 19 public UUID GlobalID
20 { 20 {
21 get { return m_uuid; } 21 get { return m_uuid; }
22 } 22 }
23 23
24 public string Name 24 public string Name
25 { 25 {
26 get { return m_name; } 26 get { return m_name; }
27 } 27 }
28 28
29 public bool IsUser 29 public bool IsUser
30 { 30 {
31 get { return true; } 31 get { return true; }
32 } 32 }
33 } 33 }
34} 34}