aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2007-08-30 13:47:04 +0000
committerMW2007-08-30 13:47:04 +0000
commite1505be97fbf71ac91e0747b7604c1bc7e54e1ed (patch)
tree85c830dedcba4b9d55c709aa9c0d6ca1ad06411d /OpenSim/Region
parentdefault to sqlite for user storage. You will have to recreate (diff)
downloadopensim-SC_OLD-e1505be97fbf71ac91e0747b7604c1bc7e54e1ed.zip
opensim-SC_OLD-e1505be97fbf71ac91e0747b7604c1bc7e54e1ed.tar.gz
opensim-SC_OLD-e1505be97fbf71ac91e0747b7604c1bc7e54e1ed.tar.bz2
opensim-SC_OLD-e1505be97fbf71ac91e0747b7604c1bc7e54e1ed.tar.xz
Added some place holder classes for various modules.
Some work on the asset cache, can people please test this. including on one of the public systems so we can see if it causes problems with multiple users.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs6
-rw-r--r--OpenSim/Region/Environment/Interfaces/ITerrain.cs46
-rw-r--r--OpenSim/Region/Environment/Modules/AssetDownloadModule.cs45
-rw-r--r--OpenSim/Region/Environment/Modules/FriendsModule.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/InstantMessageModule.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/InventoryModule.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs49
8 files changed, 176 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 5d0d2b5..17f360f 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -102,6 +102,7 @@ namespace OpenSim
102 } 102 }
103 103
104 ReadConfigSettings(startupSource); 104 ReadConfigSettings(startupSource);
105
105 } 106 }
106 107
107 protected void ReadConfigSettings(IConfigSource configSource) 108 protected void ReadConfigSettings(IConfigSource configSource)
@@ -124,6 +125,7 @@ namespace OpenSim
124 m_networkServersInfo.loadFromConfiguration(configSource); 125 m_networkServersInfo.loadFromConfiguration(configSource);
125 } 126 }
126 127
128
127 /// <summary> 129 /// <summary>
128 /// Performs initialisation of the scene, such as loading configuration from disk. 130 /// Performs initialisation of the scene, such as loading configuration from disk.
129 /// </summary> 131 /// </summary>
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 5e185ed..a35666d 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ClientStack
197 { 197 {
198 if (AgentAni.AnimationList[i].StartAnim) 198 if (AgentAni.AnimationList[i].StartAnim)
199 { 199 {
200 200
201 if (OnStartAnim != null) 201 if (OnStartAnim != null)
202 { 202 {
203 OnStartAnim(this, AgentAni.AnimationList[i].AnimID, 1); 203 OnStartAnim(this, AgentAni.AnimationList[i].AnimID, 1);
@@ -355,7 +355,9 @@ namespace OpenSim.Region.ClientStack
355 //Console.WriteLine("image request: " + Pack.ToString()); 355 //Console.WriteLine("image request: " + Pack.ToString());
356 for (int i = 0; i < imageRequest.RequestImage.Length; i++) 356 for (int i = 0; i < imageRequest.RequestImage.Length; i++)
357 { 357 {
358 m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image, imageRequest.RequestImage[i].Packet); 358
359 // Console.WriteLine("image request of "+ imageRequest.RequestImage[i].Image+ " at discard level " + imageRequest.RequestImage[i].DiscardLevel);
360 m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image, imageRequest.RequestImage[i].Packet, imageRequest.RequestImage[i].DiscardLevel);
359 } 361 }
360 break; 362 break;
361 case PacketType.TransferRequest: 363 case PacketType.TransferRequest:
diff --git a/OpenSim/Region/Environment/Interfaces/ITerrain.cs b/OpenSim/Region/Environment/Interfaces/ITerrain.cs
new file mode 100644
index 0000000..a07168e
--- /dev/null
+++ b/OpenSim/Region/Environment/Interfaces/ITerrain.cs
@@ -0,0 +1,46 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Interfaces;
5
6namespace OpenSim.Region.Environment.Interfaces
7{
8 public interface ITerrain
9 {
10 bool Tainted();
11 bool Tainted(int x, int y);
12 void ResetTaint();
13 void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west, IClientAPI remoteUser);
14 void CheckHeightValues();
15 float[] GetHeights1D();
16 float[,] GetHeights2D();
17 double[,] GetHeights2DD();
18 void GetHeights1D(float[] heights);
19 void SetHeights2D(float[,] heights);
20 void SetHeights2D(double[,] heights);
21 void SwapRevertMaps();
22 void SaveRevertMap();
23 bool RunTerrainCmd(string[] args, ref string resultText, string simName);
24 void SetRange(float min, float max);
25 void LoadFromFileF64(string filename);
26 void LoadFromFileF32(string filename);
27 void LoadFromFileF32(string filename, int dimensionX, int dimensionY, int lowerboundX, int lowerboundY);
28 void LoadFromFileIMG(string filename, int dimensionX, int dimensionY, int lowerboundX, int lowerboundY);
29 void LoadFromFileSLRAW(string filename);
30 void WriteToFileF64(string filename);
31 void WriteToFileF32(string filename);
32 void WriteToFileRAW(string filename);
33 void WriteToFileHiRAW(string filename);
34 void SetSeed(int val);
35 void RaiseTerrain(double rx, double ry, double size, double amount);
36 void LowerTerrain(double rx, double ry, double size, double amount);
37 void FlattenTerrain(double rx, double ry, double size, double amount);
38 void NoiseTerrain(double rx, double ry, double size, double amount);
39 void RevertTerrain(double rx, double ry, double size, double amount);
40 void SmoothTerrain(double rx, double ry, double size, double amount);
41 void HillsGenerator();
42 double GetHeight(int x, int y);
43 void ExportImage(string filename, string gradientmap);
44 byte[] ExportJpegImage(string gradientmap);
45 }
46}
diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
new file mode 100644
index 0000000..5d7e6a6
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
@@ -0,0 +1,45 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5using OpenSim.Framework.Interfaces;
6using OpenSim.Region.Environment.Scenes;
7using OpenSim.Region.Environment.Interfaces;
8
9
10namespace OpenSim.Region.Environment.Modules
11{
12 public class AssetDownloadModule : IRegionModule
13 {
14 private Scene m_scene;
15
16 public AssetDownloadModule()
17 {
18
19 }
20
21 public void Initialise(Scene scene)
22 {
23 m_scene = scene;
24 m_scene.EventManager.OnNewClient += NewClient;
25 }
26
27 public void PostInitialise()
28 {
29
30 }
31
32 public void CloseDown()
33 {
34 }
35
36 public string GetName()
37 {
38 return "AssetDownloadModule";
39 }
40
41 public void NewClient(IClientAPI client)
42 {
43 }
44 }
45}
diff --git a/OpenSim/Region/Environment/Modules/FriendsModule.cs b/OpenSim/Region/Environment/Modules/FriendsModule.cs
new file mode 100644
index 0000000..960d68f
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/FriendsModule.cs
@@ -0,0 +1,10 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Region.Environment.Modules
6{
7 public class FriendsModule
8 {
9 }
10}
diff --git a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
new file mode 100644
index 0000000..ef2f224
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
@@ -0,0 +1,10 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Region.Environment.Modules
6{
7 public class InstantMessageModule
8 {
9 }
10}
diff --git a/OpenSim/Region/Environment/Modules/InventoryModule.cs b/OpenSim/Region/Environment/Modules/InventoryModule.cs
new file mode 100644
index 0000000..3659292
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/InventoryModule.cs
@@ -0,0 +1,10 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Region.Environment.Modules
6{
7 public class InventoryModule
8 {
9 }
10}
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
new file mode 100644
index 0000000..a92566d
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -0,0 +1,49 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5using OpenSim.Framework.Interfaces;
6using OpenSim.Region.Environment.Scenes;
7using OpenSim.Region.Environment.Interfaces;
8
9namespace OpenSim.Region.Environment.Modules
10{
11 public class TextureDownloadModule :IRegionModule
12 {
13 private Scene m_scene;
14
15 public TextureDownloadModule()
16 {
17
18 }
19
20 public void Initialise(Scene scene)
21 {
22 m_scene = scene;
23 m_scene.EventManager.OnNewClient += NewClient;
24 }
25
26 public void PostInitialise()
27 {
28
29 }
30
31 public void CloseDown()
32 {
33 }
34
35 public string GetName()
36 {
37 return "TextureDownloadModule";
38 }
39
40 public void NewClient(IClientAPI client)
41 {
42 }
43
44 public void TextureAssetCallback(LLUUID texture, byte[] data)
45 {
46
47 }
48 }
49}