aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authorAdam Frisby2007-06-26 04:45:24 +0000
committerAdam Frisby2007-06-26 04:45:24 +0000
commit34c7a0e43a55e60466ce5527722cbdc5c946cd34 (patch)
tree3713623e7f4cf7fafdd1ca77a6c2cc74e8149c48 /Common
parent* Committing terrain filter demo (diff)
downloadopensim-SC_OLD-34c7a0e43a55e60466ce5527722cbdc5c946cd34.zip
opensim-SC_OLD-34c7a0e43a55e60466ce5527722cbdc5c946cd34.tar.gz
opensim-SC_OLD-34c7a0e43a55e60466ce5527722cbdc5c946cd34.tar.bz2
opensim-SC_OLD-34c7a0e43a55e60466ce5527722cbdc5c946cd34.tar.xz
* Terrain filters! - Think photoshop-style filters for terrain.
* Terrain filters may be written in either C# or JavaScript and loaded at runtime Use: terrain csfilter somefile.cs -- Loads a C# filter terrain jsfilter somefile.js -- Loads a JavaScript filter Once a terrain filter has been loaded, you can use the command as normal, eg terrain demofilter
Diffstat (limited to 'Common')
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs9
-rw-r--r--Common/OpenGrid.Framework.Communications/IGridServices.cs2
2 files changed, 10 insertions, 1 deletions
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
index f763446..a67f55d 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
@@ -124,6 +124,15 @@ namespace OpenGrid.Framework.Communications.OGS1
124 return neighbours; 124 return neighbours;
125 } 125 }
126 126
127 /// <summary>
128 /// Performs a XML-RPC query against the grid server returning mapblock information in the specified coordinates
129 /// </summary>
130 /// <remarks>REDUNDANT - OGS1 is to be phased out in favour of OGS2</remarks>
131 /// <param name="minX">Minimum X value</param>
132 /// <param name="minY">Minimum Y value</param>
133 /// <param name="maxX">Maximum X value</param>
134 /// <param name="maxY">Maximum Y value</param>
135 /// <returns>Hashtable of hashtables containing map data elements</returns>
127 private Hashtable MapBlockQuery(int minX, int minY, int maxX, int maxY) 136 private Hashtable MapBlockQuery(int minX, int minY, int maxX, int maxY)
128 { 137 {
129 Hashtable param = new Hashtable(); 138 Hashtable param = new Hashtable();
diff --git a/Common/OpenGrid.Framework.Communications/IGridServices.cs b/Common/OpenGrid.Framework.Communications/IGridServices.cs
index 469cf80..d3b7c07 100644
--- a/Common/OpenGrid.Framework.Communications/IGridServices.cs
+++ b/Common/OpenGrid.Framework.Communications/IGridServices.cs
@@ -36,7 +36,7 @@ namespace OpenGrid.Framework.Communications
36{ 36{
37 public class GridInfo 37 public class GridInfo
38 { 38 {
39 public string GridServerURI = "http://grid:8001/"; 39 public string GridServerURI = "http://grid.deepgrid.com:8001/"; // Temporarily hardcoded.
40 public string GridServerSendKey = "badger"; 40 public string GridServerSendKey = "badger";
41 public string GridServerRecvKey = "badger"; 41 public string GridServerRecvKey = "badger";
42 } 42 }