diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
deleted file mode 100644
index 563eaf76c2..0000000000
--- a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
-namespace OpenGrid.Framework.Communications.OGS1
-{
- public class GridCommsManager : CommunicationsManager
- {
- private OGS1GridServices gridInterComms = new OGS1GridServices();
- public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
- {
- GridServer = gridInterComms;
- InterRegion = gridInterComms;
- UserServer = new OGSUserServices();
- }
- }
-}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs
deleted file mode 100644
index 1667e6be88..0000000000
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenGrid.Framework.Communications;
-using OpenGrid.Framework.Data;
-using libsecondlife;
-
-namespace OpenGrid.Framework.Communications.OGS1
-{
- public class OGSUserServices :IUserServices
- {
- public UserProfileData GetUserProfile(string firstName, string lastName)
- {
- return null;
- }
- public UserProfileData GetUserProfile(string name)
- {
- return null;
- }
- public UserProfileData GetUserProfile(LLUUID avatarID)
- {
- return null;
- }
- }
-}
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
deleted file mode 100644
index 82d4f5fab5..0000000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {39BD9497-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data.DB4o
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data.DB4o
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\Db4objects.Db4o.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858 b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
deleted file mode 100644
index d6dd03d809..0000000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {BC0F052F-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data.DB4o
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data.DB4o
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ../../bin/
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ../../bin/
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\Db4objects.Db4o.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {12DD8EB8-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921 b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
deleted file mode 100644
index 3b783ca607..0000000000
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {39BD9497-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data.DB4o
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data.DB4o
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\Db4objects.Db4o.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
deleted file mode 100644
index a57220494c..0000000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {62CDF671-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858 b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
deleted file mode 100644
index 3b6d24d730..0000000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {12DD8EB8-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ../../bin/
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ../../bin/
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921 b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
deleted file mode 100644
index 990cd16292..0000000000
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {62CDF671-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
deleted file mode 100644
index ae8a33c8f0..0000000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- Debug
- AnyCPU
- E:\work\oslauth\sim\branches\Sugilite\bin\
- 8.0.50727
- ProjectFiles
- 0
-
-
-
-
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build
deleted file mode 100644
index 9dc2383108..0000000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj
deleted file mode 100644
index 43f56a44c6..0000000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {D1D78B8D-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.UserManager
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.UserManager
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- ..\..\bin\Db4objects.Db4o.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- OpenSim.Framework.dll
- False
-
-
- OpenSim.Framework.Console.dll
- False
-
-
- OpenSim.GenericConfig.Xml.dll
- False
-
-
- OpenSim.Servers.dll
- False
-
-
- System.dll
- False
-
-
- System.Data.dll
- False
-
-
- System.Xml.dll
- False
-
-
- XMLRPC.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user
deleted file mode 100644
index 594154734d..0000000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- Debug
- AnyCPU
- C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\
- 8.0.50727
- ProjectFiles
- 0
-
-
-
-
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build
deleted file mode 100644
index 81a87f58b8..0000000000
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
deleted file mode 100644
index 6e8eba7604..0000000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {8BB20F0A-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
-
- OpenSim.Servers
- JScript
- Grid
- IE50
- false
- Library
-
-
- OpenSim.Servers
-
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
-
-
- OpenSim.Framework
- {8ACA2445-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Framework.Console
- {A7CD0630-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- XMLRPC
- {8E81D43C-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
deleted file mode 100644
index 4103e737a9..0000000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/XmlRpcCS/Logger.cs b/Common/XmlRpcCS/Logger.cs
deleted file mode 100644
index ebf804bc62..0000000000
--- a/Common/XmlRpcCS/Logger.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
-
- /// Define levels of logging. This duplicates
- /// similar enumerations in System.Diagnostics.EventLogEntryType. The
- /// duplication was merited because .NET Compact Framework lacked the EventLogEntryType enum.
- public enum LogLevel
- {
- /// Information level, log entry for informational reasons only.
- Information,
- /// Warning level, indicates a possible problem.
- Warning,
- /// Error level, implies a significant problem.
- Error
- }
-
- ///
- ///Logging singleton with swappable output delegate.
- ///
- ///
- ///This singleton provides a centralized log. The actual WriteEntry calls are passed
- ///off to a delegate however. Having a delegate do the actual logginh allows you to
- ///implement different logging mechanism and have them take effect throughout the system.
- ///
- public class Logger
- {
- ///Delegate definition for logging.
- ///The message String to log.
- ///The LogLevel of your message.
- public delegate void LoggerDelegate(String message, LogLevel level);
- ///The LoggerDelegate that will recieve WriteEntry requests.
- static public LoggerDelegate Delegate = null;
-
- ///
- ///Method logging events are sent to.
- ///
- ///The message String to log.
- ///The LogLevel of your message.
- static public void WriteEntry(String message, LogLevel level)
- {
- if (Delegate != null)
- Delegate(message, level);
- }
- }
-}
diff --git a/Common/XmlRpcCS/SimpleHttpRequest.cs b/Common/XmlRpcCS/SimpleHttpRequest.cs
deleted file mode 100644
index e5326c3d90..0000000000
--- a/Common/XmlRpcCS/SimpleHttpRequest.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.IO;
- using System.Net.Sockets;
- using System.Collections;
-
- ///Very basic HTTP request handler.
- ///This class is designed to accept a TcpClient and treat it as an HTTP request.
- /// It will do some basic header parsing and manage the input and output streams associated
- /// with the request.
- public class SimpleHttpRequest
- {
- private String _httpMethod = null;
- private String _protocol;
- private String _filePathFile = null;
- private String _filePathDir = null;
- private String __filePath;
- private TcpClient _client;
- private StreamReader _input;
- private StreamWriter _output;
- private Hashtable _headers;
-
- /// A constructor which accepts the TcpClient.
- /// It creates the associated input and output streams, determines the request type,
- /// and parses the remaining HTTP header.
- /// The TcpClient associated with the HTTP connection.
- public SimpleHttpRequest(TcpClient client)
- {
- _client = client;
- _output = new StreamWriter(client.GetStream());
- _input = new StreamReader(client.GetStream());
- GetRequestMethod();
- GetRequestHeaders();
- }
-
- /// The output StreamWriter associated with the request.
- public StreamWriter Output
- {
- get { return _output; }
- }
-
- /// The input StreamReader associated with the request.
- public StreamReader Input
- {
- get { return _input; }
- }
-
- /// The TcpClient with the request.
- public TcpClient Client
- {
- get { return _client; }
- }
-
- private String _filePath
- {
- get { return __filePath; }
- set
- {
- __filePath = value;
- _filePathDir = null;
- _filePathFile = null;
- }
- }
-
- /// The type of HTTP request (i.e. PUT, GET, etc.).
- public String HttpMethod
- {
- get { return _httpMethod; }
- }
-
- /// The level of the HTTP protocol.
- public String Protocol
- {
- get { return _protocol; }
- }
-
- /// The "path" which is part of any HTTP request.
- public String FilePath
- {
- get { return _filePath; }
- }
-
- /// The file portion of the "path" which is part of any HTTP request.
- public String FilePathFile
- {
- get
- {
- if (_filePathFile != null)
- return _filePathFile;
-
- int i = FilePath.LastIndexOf("/");
-
- if (i == -1)
- return "";
-
- i++;
- _filePathFile = FilePath.Substring(i, FilePath.Length - i);
- return _filePathFile;
- }
- }
-
- /// The directory portion of the "path" which is part of any HTTP request.
- public String FilePathDir
- {
- get
- {
- if (_filePathDir != null)
- return _filePathDir;
-
- int i = FilePath.LastIndexOf("/");
-
- if (i == -1)
- return "";
-
- i++;
- _filePathDir = FilePath.Substring(0, i);
- return _filePathDir;
- }
- }
-
- private void GetRequestMethod()
- {
- string req = _input.ReadLine();
- if (req == null)
- throw new ApplicationException("Void request.");
-
- if (0 == String.Compare("GET ", req.Substring(0, 4), true))
- _httpMethod = "GET";
- else if (0 == String.Compare("POST ", req.Substring(0, 5), true))
- _httpMethod = "POST";
- else
- throw new InvalidOperationException("Unrecognized method in query: " + req);
-
- req = req.TrimEnd();
- int idx = req.IndexOf(' ') + 1;
- if (idx >= req.Length)
- throw new ApplicationException("What do you want?");
-
- string page_protocol = req.Substring(idx);
- int idx2 = page_protocol.IndexOf(' ');
- if (idx2 == -1)
- idx2 = page_protocol.Length;
-
- _filePath = page_protocol.Substring(0, idx2).Trim();
- _protocol = page_protocol.Substring(idx2).Trim();
- }
-
- private void GetRequestHeaders()
- {
- String line;
- int idx;
-
- _headers = new Hashtable();
-
- while ((line = _input.ReadLine()) != "")
- {
- if (line == null)
- {
- break;
- }
-
- idx = line.IndexOf(':');
- if (idx == -1 || idx == line.Length - 1)
- {
- Logger.WriteEntry("Malformed header line: " + line, LogLevel.Information);
- continue;
- }
-
- String key = line.Substring(0, idx);
- String value = line.Substring(idx + 1);
-
- try
- {
- _headers.Add(key, value);
- }
- catch (Exception)
- {
- Logger.WriteEntry("Duplicate header key in line: " + line, LogLevel.Information);
- }
- }
- }
-
- ///
- /// Format the object contents into a useful string representation.
- ///
- ///String representation of the SimpleHttpRequest as the HttpMethod FilePath Protocol.
- override public String ToString()
- {
- return HttpMethod + " " + FilePath + " " + Protocol;
- }
-
- ///
- /// Close the SimpleHttpRequest. This flushes and closes all associated io streams.
- ///
- public void Close()
- {
- _output.Flush();
- _output.Close();
- _input.Close();
- _client.Close();
- }
- }
-}
diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
deleted file mode 100644
index 61f8be0162..0000000000
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {8E81D43C-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- XMLRPC
- JScript
- Grid
- IE50
- false
- Library
-
- XMLRPC
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
deleted file mode 100644
index 2eabfcd0c4..0000000000
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs b/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs
deleted file mode 100644
index f87f7a5060..0000000000
--- a/Common/XmlRpcCS/XmlRpcBoxcarRequest.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
- using System.Net;
- using System.Text;
- using System.Reflection;
-
- /// Class that collects individual XmlRpcRequest objects and submits them as a boxcarred request.
- /// A boxcared request is when a number of request are collected before being sent via XML-RPC, and then are sent via
- /// a single HTTP connection. This results in a speed up from reduced connection time. The results are then retuned collectively
- /// as well.
- ///
- ///
- public class XmlRpcBoxcarRequest : XmlRpcRequest
- {
- /// ArrayList to collect the requests to boxcar.
- public IList Requests = new ArrayList();
-
- /// Basic constructor.
- public XmlRpcBoxcarRequest()
- {
- }
-
- /// Returns the String "system.multiCall" which is the server method that handles boxcars.
- public override String MethodName
- {
- get { return "system.multiCall"; }
- }
-
- /// The ArrayList of boxcarred Requests as properly formed parameters.
- public override IList Params
- {
- get {
- _params.Clear();
- ArrayList reqArray = new ArrayList();
- foreach (XmlRpcRequest request in Requests)
- {
- Hashtable requestEntry = new Hashtable();
- requestEntry.Add(XmlRpcXmlTokens.METHOD_NAME, request.MethodName);
- requestEntry.Add(XmlRpcXmlTokens.PARAMS, request.Params);
- reqArray.Add(requestEntry);
- }
- _params.Add(reqArray);
- return _params;
- }
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcClientProxy.cs b/Common/XmlRpcCS/XmlRpcClientProxy.cs
deleted file mode 100644
index f52273a7cb..0000000000
--- a/Common/XmlRpcCS/XmlRpcClientProxy.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Runtime.Remoting.Proxies;
- using System.Runtime.Remoting.Messaging;
-
- /// This class provides support for creating local proxies of XML-RPC remote objects
- ///
- /// To create a local proxy you need to create a local C# interface and then, via createProxy
- /// associate that interface with a remote object at a given URL.
- ///
-public class XmlRpcClientProxy : RealProxy
-{
- private String _remoteObjectName;
- private String _url;
- private XmlRpcRequest _client = new XmlRpcRequest();
-
- /// Factory method to create proxies.
- ///
- /// To create a local proxy you need to create a local C# interface with methods that mirror those of the server object.
- /// Next, pass that interface into createProxy along with the object name and URL of the remote object and
- /// cast the resulting object to the specifice interface.
- ///
- /// String The name of the remote object.
- /// String The URL of the remote object.
- /// Type The typeof() of a C# interface.
- /// Object A proxy for your specified interface. Cast to appropriate type.
- public static Object createProxy(String remoteObjectName, String url, Type anInterface)
- {
- return new XmlRpcClientProxy(remoteObjectName, url, anInterface).GetTransparentProxy();
- }
-
- private XmlRpcClientProxy(String remoteObjectName, String url, Type t) : base(t)
- {
- _remoteObjectName = remoteObjectName;
- _url = url;
- }
-
- /// The local method dispatcher - do not invoke.
- override public IMessage Invoke(IMessage msg)
- {
- IMethodCallMessage methodMessage = (IMethodCallMessage)msg;
-
- _client.MethodName = _remoteObjectName + "." + methodMessage.MethodName;
- _client.Params.Clear();
- foreach (Object o in methodMessage.Args)
- _client.Params.Add(o);
-
- try
- {
- Object ret = _client.Invoke(_url);
- return new ReturnMessage(ret,null,0,
- methodMessage.LogicalCallContext, methodMessage);
- }
- catch (Exception e)
- {
- return new ReturnMessage(e, methodMessage);
- }
- }
-}
-}
diff --git a/Common/XmlRpcCS/XmlRpcDeserializer.cs b/Common/XmlRpcCS/XmlRpcDeserializer.cs
deleted file mode 100644
index bd736c0276..0000000000
--- a/Common/XmlRpcCS/XmlRpcDeserializer.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
- using System.Globalization;
-
- /// Parser context, we maintain contexts in a stack to avoiding recursion.
- struct Context
- {
- public String Name;
- public Object Container;
- }
-
- /// Basic XML-RPC data deserializer.
- /// Uses XmlTextReader to parse the XML data. This level of the class
- /// only handles the tokens common to both Requests and Responses. This class is not useful in and of itself
- /// but is designed to be subclassed.
- public class XmlRpcDeserializer : XmlRpcXmlTokens
- {
- private static DateTimeFormatInfo _dateFormat = new DateTimeFormatInfo();
-
- private Object _container;
- private Stack _containerStack;
-
- /// Protected reference to last text.
- protected String _text;
- /// Protected reference to last deserialized value.
- protected Object _value;
- /// Protected reference to last name field.
- protected String _name;
-
-
- /// Basic constructor.
- public XmlRpcDeserializer()
- {
- Reset();
- _dateFormat.FullDateTimePattern = ISO_DATETIME;
- }
-
- /// Static method that parses XML data into a response using the Singleton.
- /// StreamReader containing an XML-RPC response.
- /// Object object resulting from the deserialization.
- virtual public Object Deserialize(TextReader xmlData)
- {
- return null;
- }
-
- /// Protected method to parse a node in an XML-RPC XML stream.
- /// Method deals with elements common to all XML-RPC data, subclasses of
- /// this object deal with request/response spefic elements.
- /// XmlTextReader of the in progress parsing data stream.
- protected void DeserializeNode(XmlTextReader reader)
- {
- switch (reader.NodeType)
- {
- case XmlNodeType.Element:
- if (Logger.Delegate != null)
- Logger.WriteEntry("START " + reader.Name, LogLevel.Information);
- switch (reader.Name)
- {
- case VALUE:
- _value = null;
- _text = null;
- break;
- case STRUCT:
- PushContext();
- _container = new Hashtable();
- break;
- case ARRAY:
- PushContext();
- _container = new ArrayList();
- break;
- }
- break;
- case XmlNodeType.EndElement:
- if (Logger.Delegate != null)
- Logger.WriteEntry("END " + reader.Name, LogLevel.Information);
- switch (reader.Name)
- {
- case BASE64:
- _value = Convert.FromBase64String(_text);
- break;
- case BOOLEAN:
- int val = Int16.Parse(_text);
- if (val == 0)
- _value = false;
- else if (val == 1)
- _value = true;
- break;
- case STRING:
- _value = _text;
- break;
- case DOUBLE:
- _value = Double.Parse(_text);
- break;
- case INT:
- case ALT_INT:
- _value = Int32.Parse(_text);
- break;
- case DATETIME:
-#if __MONO__
- _value = DateParse(_text);
-#else
- _value = DateTime.ParseExact(_text, "F", _dateFormat);
-#endif
- break;
- case NAME:
- _name = _text;
- break;
- case VALUE:
- if (_value == null)
- _value = _text; // some kits don't use tag, they just do
-
- if ((_container != null) && (_container is IList)) // in an array? If so add value to it.
- ((IList)_container).Add(_value);
- break;
- case MEMBER:
- if ((_container != null) && (_container is IDictionary)) // in an struct? If so add value to it.
- ((IDictionary)_container).Add(_name, _value);
- break;
- case ARRAY:
- case STRUCT:
- _value = _container;
- PopContext();
- break;
- }
- break;
- case XmlNodeType.Text:
- if (Logger.Delegate != null)
- Logger.WriteEntry("Text " + reader.Value, LogLevel.Information);
- _text = reader.Value;
- break;
- default:
- break;
- }
- }
-
- /// Static method that parses XML in a String into a
- /// request using the Singleton.
- /// String containing an XML-RPC request.
- /// XmlRpcRequest object resulting from the parse.
- public Object Deserialize(String xmlData)
- {
- StringReader sr = new StringReader(xmlData);
- return Deserialize(sr);
- }
-
- /// Pop a Context of the stack, an Array or Struct has closed.
- private void PopContext()
- {
- Context c = (Context)_containerStack.Pop();
- _container = c.Container;
- _name = c.Name;
- }
-
- /// Push a Context on the stack, an Array or Struct has opened.
- private void PushContext()
- {
- Context context;
-
- context.Container = _container;
- context.Name = _name;
-
- _containerStack.Push(context);
- }
-
- /// Reset the internal state of the deserializer.
- protected void Reset()
- {
- _text = null;
- _value = null;
- _name = null;
- _container = null;
- _containerStack = new Stack();
- }
-
-#if __MONO__
- private DateTime DateParse(String str)
- {
- int year = Int32.Parse(str.Substring(0,4));
- int month = Int32.Parse(str.Substring(4,2));
- int day = Int32.Parse(str.Substring(6,2));
- int hour = Int32.Parse(str.Substring(9,2));
- int min = Int32.Parse(str.Substring(12,2));
- int sec = Int32.Parse(str.Substring(15,2));
- return new DateTime(year,month,day,hour,min,sec);
- }
-#endif
-
- }
-}
-
-
diff --git a/Common/XmlRpcCS/XmlRpcErrorCodes.cs b/Common/XmlRpcCS/XmlRpcErrorCodes.cs
deleted file mode 100644
index 6dec57d43f..0000000000
--- a/Common/XmlRpcCS/XmlRpcErrorCodes.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
-
- /// Standard XML-RPC error codes.
- public class XmlRpcErrorCodes
- {
- ///
- public const int PARSE_ERROR_MALFORMED = -32700;
- ///
- public const String PARSE_ERROR_MALFORMED_MSG = "Parse Error, not well formed";
-
- ///
- public const int PARSE_ERROR_ENCODING = -32701;
- ///
- public const String PARSE_ERROR_ENCODING_MSG = "Parse Error, unsupported encoding";
-
- //
- // -32702 ---> parse error. invalid character for encoding
- // -32600 ---> server error. invalid xml-rpc. not conforming to spec.
- //
-
- ///
- public const int SERVER_ERROR_METHOD = -32601;
- ///
- public const String SERVER_ERROR_METHOD_MSG = "Server Error, requested method not found";
-
- ///
- public const int SERVER_ERROR_PARAMS = -32602;
- ///
- public const String SERVER_ERROR_PARAMS_MSG = "Server Error, invalid method parameters";
-
- //
- // -32603 ---> server error. internal xml-rpc error
- //
-
- ///
- public const int APPLICATION_ERROR = -32500;
- ///
- public const String APPLICATION_ERROR_MSG = "Application Error";
-
- //
- // -32400 ---> system error
- //
-
- ///
- public const int TRANSPORT_ERROR = -32300;
- ///
- public const String TRANSPORT_ERROR_MSG = "Transport Layer Error";
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcException.cs b/Common/XmlRpcCS/XmlRpcException.cs
deleted file mode 100644
index fd1f4ae3a7..0000000000
--- a/Common/XmlRpcCS/XmlRpcException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
-
- /// An XML-RPC Exception.
- /// Maps a C# exception to an XML-RPC fault. Normal exceptions
- /// include a message so this adds the code needed by XML-RPC.
- public class XmlRpcException : Exception
- {
- private int _code;
-
- /// Instantiate an XmlRpcException with a code and message.
- /// Int faultCode associated with this exception.
- /// String faultMessage associated with this exception.
- public XmlRpcException(int code, String message)
- : base(message)
- {
- _code = code;
- }
-
- /// The value of the faults message, i.e. the faultString.
- public String FaultString
- {
- get { return Message; }
- }
-
- /// The value of the faults code, i.e. the faultCode.
- public int FaultCode
- {
- get { return _code; }
- }
-
- /// Format the message to include the code.
- override public String ToString()
- {
- return "Code: " + FaultCode + " Message: " + base.ToString();
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcExposedAttribute.cs b/Common/XmlRpcCS/XmlRpcExposedAttribute.cs
deleted file mode 100644
index 67b27aecee..0000000000
--- a/Common/XmlRpcCS/XmlRpcExposedAttribute.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Reflection;
-
- ///
- /// Simple tagging attribute to indicate participation is XML-RPC exposure.
- ///
- ///
- /// If present at the class level it indicates that this class does explicitly
- /// expose methods. If present at the method level it denotes that the method
- /// is exposed.
- ///
- [AttributeUsage(
- AttributeTargets.Class | AttributeTargets.Method,
- AllowMultiple = false,
- Inherited = true
- )]
- public class XmlRpcExposedAttribute : Attribute
- {
- /// Check if obj is an object utilizing the XML-RPC exposed Attribute.
- /// Object of a class or method to check for attribute.
- /// Boolean true if attribute present.
- public static Boolean ExposedObject(Object obj)
- {
- return IsExposed(obj.GetType());
- }
-
- /// Check if obj.methodName is an XML-RPC exposed method.
- /// A method is considered to be exposed if it exists and, either, the object does not use the XmlRpcExposed attribute,
- /// or the object does use the XmlRpcExposed attribute and the method has the XmlRpcExposed attribute as well.
- /// Boolean true if the method is exposed.
- public static Boolean ExposedMethod(Object obj, String methodName)
- {
- Type type = obj.GetType();
- MethodInfo method = type.GetMethod(methodName);
-
- if (method == null)
- throw new MissingMethodException("Method " + methodName + " not found.");
-
- if (!IsExposed(type))
- return true;
-
- return IsExposed(method);
- }
-
- /// Check if mi is XML-RPC exposed.
- /// MemberInfo of a class or method to check for attribute.
- /// Boolean true if attribute present.
- public static Boolean IsExposed(MemberInfo mi)
- {
- foreach (Attribute attr in mi.GetCustomAttributes(true))
- {
- if (attr is XmlRpcExposedAttribute)
- return true;
- }
- return false;
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcRequest.cs b/Common/XmlRpcCS/XmlRpcRequest.cs
deleted file mode 100644
index 18d2182c44..0000000000
--- a/Common/XmlRpcCS/XmlRpcRequest.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
- using System.Net;
- using System.Text;
- using System.Reflection;
- using System.Net.Security;
- using System.Security.Cryptography.X509Certificates;
-
- internal class AcceptAllCertificatePolicy : ICertificatePolicy
- {
- public AcceptAllCertificatePolicy()
- {
- }
-
- public bool CheckValidationResult(ServicePoint sPoint,
- System.Security.Cryptography.X509Certificates.X509Certificate cert,
- WebRequest wRequest, int certProb)
- {
- // Always accept
- return true;
- }
- }
-
- /// Class supporting the request side of an XML-RPC transaction.
- public class XmlRpcRequest
- {
- private String _methodName = null;
- private Encoding _encoding = new ASCIIEncoding();
- private XmlRpcRequestSerializer _serializer = new XmlRpcRequestSerializer();
- private XmlRpcResponseDeserializer _deserializer = new XmlRpcResponseDeserializer();
-
- /// ArrayList containing the parameters.
- protected IList _params = null;
-
- /// Instantiate an XmlRpcRequest
- public XmlRpcRequest()
- {
- _params = new ArrayList();
- }
-
- /// Instantiate an XmlRpcRequest for a specified method and parameters.
- /// String designating the object.method on the server the request
- /// should be directed to.
- /// ArrayList of XML-RPC type parameters to invoke the request with.
- public XmlRpcRequest(String methodName, IList parameters)
- {
- MethodName = methodName;
- _params = parameters;
- }
-
- /// ArrayList conntaining the parameters for the request.
- public virtual IList Params
- {
- get { return _params; }
- }
-
- /// String conntaining the method name, both object and method, that the request will be sent to.
- public virtual String MethodName
- {
- get { return _methodName; }
- set { _methodName = value; }
- }
-
- /// String object name portion of the method name.
- public String MethodNameObject
- {
- get
- {
- int index = MethodName.IndexOf(".");
-
- if (index == -1)
- return MethodName;
-
- return MethodName.Substring(0, index);
- }
- }
-
- /// String method name portion of the object.method name.
- public String MethodNameMethod
- {
- get
- {
- int index = MethodName.IndexOf(".");
-
- if (index == -1)
- return MethodName;
-
- return MethodName.Substring(index + 1, MethodName.Length - index - 1);
- }
- }
-
- /// Invoke this request on the server.
- /// String The url of the XML-RPC server.
- /// Object The value returned from the method invocation on the server.
- /// If an exception generated on the server side.
- public Object Invoke(String url)
- {
- XmlRpcResponse res = Send(url, 10000);
-
- if (res.IsFault)
- throw new XmlRpcException(res.FaultCode, res.FaultString);
-
- return res.Value;
- }
-
- /// Send the request to the server.
- /// String The url of the XML-RPC server.
- /// Milliseconds before the connection times out.
- /// XmlRpcResponse The response generated.
- public XmlRpcResponse Send(String url, int timeout)
- {
- // Override SSL authentication mechanisms
- ServicePointManager.CertificatePolicy = new AcceptAllCertificatePolicy();
-
- HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
- if (request == null)
- throw new XmlRpcException(XmlRpcErrorCodes.TRANSPORT_ERROR,
- XmlRpcErrorCodes.TRANSPORT_ERROR_MSG + ": Could not create request with " + url);
- request.Method = "POST";
- request.ContentType = "text/xml";
- request.AllowWriteStreamBuffering = true;
- request.Timeout = timeout;
-
- Stream stream = request.GetRequestStream();
- XmlTextWriter xml = new XmlTextWriter(stream, _encoding);
- _serializer.Serialize(xml, this);
- xml.Flush();
- xml.Close();
-
- HttpWebResponse response = (HttpWebResponse)request.GetResponse();
- StreamReader input = new StreamReader(response.GetResponseStream());
-
- XmlRpcResponse resp = (XmlRpcResponse)_deserializer.Deserialize(input);
- input.Close();
- response.Close();
- return resp;
- }
-
- /// Produce String representation of the object.
- /// String representation of the object.
- override public String ToString()
- {
- return _serializer.Serialize(this);
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs b/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
deleted file mode 100644
index 0770b7ed67..0000000000
--- a/Common/XmlRpcCS/XmlRpcRequestDeserializer.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.Diagnostics;
- using System.IO;
- using System.Xml;
-
- /// Class to deserialize XML data representing a request.
- public class XmlRpcRequestDeserializer : XmlRpcDeserializer
- {
- static private XmlRpcRequestDeserializer _singleton;
- /// A static singleton instance of this deserializer.
- [Obsolete("This object is now thread safe, just use an instance.", false)]
- static public XmlRpcRequestDeserializer Singleton
- {
- get
- {
- if (_singleton == null)
- _singleton = new XmlRpcRequestDeserializer();
-
- return _singleton;
- }
- }
-
- /// Static method that parses XML data into a request using the Singleton.
- /// StreamReader containing an XML-RPC request.
- /// XmlRpcRequest object resulting from the parse.
- override public Object Deserialize(TextReader xmlData)
- {
- XmlTextReader reader = new XmlTextReader(xmlData);
- XmlRpcRequest request = new XmlRpcRequest();
- bool done = false;
-
- lock (this)
- {
- Reset();
- while (!done && reader.Read())
- {
- DeserializeNode(reader); // Parent parse...
- switch (reader.NodeType)
- {
- case XmlNodeType.EndElement:
- switch (reader.Name)
- {
- case METHOD_NAME:
- request.MethodName = _text;
- break;
- case METHOD_CALL:
- done = true;
- break;
- case PARAM:
- request.Params.Add(_value);
- _text = null;
- break;
- }
- break;
- }
- }
- }
- return request;
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcRequestSerializer.cs b/Common/XmlRpcCS/XmlRpcRequestSerializer.cs
deleted file mode 100644
index 8099bdb334..0000000000
--- a/Common/XmlRpcCS/XmlRpcRequestSerializer.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.Xml;
- using System.IO;
-
- /// Class responsible for serializing an XML-RPC request.
- /// This class handles the request envelope, depending on XmlRpcSerializer
- /// to serialize the payload.
- ///
- public class XmlRpcRequestSerializer : XmlRpcSerializer
- {
- static private XmlRpcRequestSerializer _singleton;
- /// A static singleton instance of this deserializer.
- static public XmlRpcRequestSerializer Singleton
- {
- get
- {
- if (_singleton == null)
- _singleton = new XmlRpcRequestSerializer();
-
- return _singleton;
- }
- }
-
- /// Serialize the XmlRpcRequest to the output stream.
- /// An XmlTextWriter stream to write data to.
- /// An XmlRpcRequest to serialize.
- ///
- override public void Serialize(XmlTextWriter output, Object obj)
- {
- XmlRpcRequest request = (XmlRpcRequest)obj;
- output.WriteStartDocument();
- output.WriteStartElement(METHOD_CALL);
- output.WriteElementString(METHOD_NAME, request.MethodName);
- output.WriteStartElement(PARAMS);
- foreach (Object param in request.Params)
- {
- output.WriteStartElement(PARAM);
- output.WriteStartElement(VALUE);
- SerializeObject(output, param);
- output.WriteEndElement();
- output.WriteEndElement();
- }
-
- output.WriteEndElement();
- output.WriteEndElement();
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcResponder.cs b/Common/XmlRpcCS/XmlRpcResponder.cs
deleted file mode 100644
index 041256899f..0000000000
--- a/Common/XmlRpcCS/XmlRpcResponder.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Xml;
- using System.Net.Sockets;
-
- /// The class is a container of the context of an XML-RPC dialog on the server side.
- /// Instances of this class maintain the context for an individual XML-RPC server
- /// side dialog. Namely they manage an inbound deserializer and an outbound serializer.
- public class XmlRpcResponder
- {
- private XmlRpcRequestDeserializer _deserializer = new XmlRpcRequestDeserializer();
- private XmlRpcResponseSerializer _serializer = new XmlRpcResponseSerializer();
- private XmlRpcServer _server;
- private TcpClient _client;
- private SimpleHttpRequest _httpReq;
-
- /// The SimpleHttpRequest based on the TcpClient.
- public SimpleHttpRequest HttpReq
- {
- get { return _httpReq; }
- }
-
- /// Basic constructor.
- /// XmlRpcServer that this XmlRpcResponder services.
- /// TcpClient with the connection.
- public XmlRpcResponder(XmlRpcServer server, TcpClient client)
- {
- _server = server;
- _client = client;
- _httpReq = new SimpleHttpRequest(_client);
- }
-
- /// Call close to insure proper shutdown.
- ~XmlRpcResponder()
- {
- Close();
- }
-
- ///Respond using this responders HttpReq.
- public void Respond()
- {
- Respond(HttpReq);
- }
-
- /// Handle an HTTP request containing an XML-RPC request.
- /// This method deserializes the XML-RPC request, invokes the
- /// described method, serializes the response (or fault) and sends the XML-RPC response
- /// back as a valid HTTP page.
- ///
- /// SimpleHttpRequest containing the request.
- public void Respond(SimpleHttpRequest httpReq)
- {
- XmlRpcRequest xmlRpcReq = (XmlRpcRequest)_deserializer.Deserialize(httpReq.Input);
- XmlRpcResponse xmlRpcResp = new XmlRpcResponse();
-
- try
- {
- xmlRpcResp.Value = _server.Invoke(xmlRpcReq);
- }
- catch (XmlRpcException e)
- {
- xmlRpcResp.SetFault(e.FaultCode, e.FaultString);
- }
- catch (Exception e2)
- {
- xmlRpcResp.SetFault(XmlRpcErrorCodes.APPLICATION_ERROR,
- XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": " + e2.Message);
- }
-
- if (Logger.Delegate != null)
- Logger.WriteEntry(xmlRpcResp.ToString(), LogLevel.Information);
-
- XmlRpcServer.HttpHeader(httpReq.Protocol, "text/xml", 0, " 200 OK", httpReq.Output);
- httpReq.Output.Flush();
- XmlTextWriter xml = new XmlTextWriter(httpReq.Output);
- _serializer.Serialize(xml, xmlRpcResp);
- xml.Flush();
- httpReq.Output.Flush();
- }
-
- ///Close all contained resources, both the HttpReq and client.
- public void Close()
- {
- if (_httpReq != null)
- {
- _httpReq.Close();
- _httpReq = null;
- }
-
- if (_client != null)
- {
- _client.Close();
- _client = null;
- }
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcResponse.cs b/Common/XmlRpcCS/XmlRpcResponse.cs
deleted file mode 100644
index 8ff8354eca..0000000000
--- a/Common/XmlRpcCS/XmlRpcResponse.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- /// Class designed to represent an XML-RPC response.
- public class XmlRpcResponse
- {
- private Object _value;
- /// bool indicating if this response represents a fault.
- public bool IsFault;
-
- /// Basic constructor
- public XmlRpcResponse()
- {
- Value = null;
- IsFault = false;
- }
-
- /// Constructor for a fault.
- /// int the numeric faultCode value.
- /// String the faultString value.
- public XmlRpcResponse(int code, String message)
- : this()
- {
- SetFault(code, message);
- }
-
- /// The data value of the response, may be fault data.
- public Object Value
- {
- get { return _value; }
- set
- {
- IsFault = false;
- _value = value;
- }
- }
-
- /// The faultCode if this is a fault.
- public int FaultCode
- {
- get
- {
- if (!IsFault)
- return 0;
- else
- return (int)((Hashtable)_value)[XmlRpcXmlTokens.FAULT_CODE];
- }
- }
-
- /// The faultString if this is a fault.
- public String FaultString
- {
- get
- {
- if (!IsFault)
- return "";
- else
- return (String)((Hashtable)_value)[XmlRpcXmlTokens.FAULT_STRING];
- }
- }
-
- /// Set this response to be a fault.
- /// int the numeric faultCode value.
- /// String the faultString value.
- public void SetFault(int code, String message)
- {
- Hashtable fault = new Hashtable();
- fault.Add("faultCode", code);
- fault.Add("faultString", message);
- Value = fault;
- IsFault = true;
- }
-
- /// Form a useful string representation of the object, in this case the XML response.
- /// String The XML serialized XML-RPC response.
- override public String ToString()
- {
- return XmlRpcResponseSerializer.Singleton.Serialize(this);
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs b/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs
deleted file mode 100644
index 032d8a3937..0000000000
--- a/Common/XmlRpcCS/XmlRpcResponseDeserializer.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- /// Class to deserialize XML data representing a response.
- public class XmlRpcResponseDeserializer : XmlRpcDeserializer
- {
- static private XmlRpcResponseDeserializer _singleton;
- /// A static singleton instance of this deserializer.
- [Obsolete("This object is now thread safe, just use an instance.", false)]
- static public XmlRpcResponseDeserializer Singleton
- {
- get
- {
- if (_singleton == null)
- _singleton = new XmlRpcResponseDeserializer();
-
- return _singleton;
- }
- }
-
- /// Static method that parses XML data into a response using the Singleton.
- /// StreamReader containing an XML-RPC response.
- /// XmlRpcResponse object resulting from the parse.
- override public Object Deserialize(TextReader xmlData)
- {
- XmlTextReader reader = new XmlTextReader(xmlData);
- XmlRpcResponse response = new XmlRpcResponse();
- bool done = false;
-
- lock (this)
- {
- Reset();
-
- while (!done && reader.Read())
- {
- DeserializeNode(reader); // Parent parse...
- switch (reader.NodeType)
- {
- case XmlNodeType.EndElement:
- switch (reader.Name)
- {
- case FAULT:
- response.Value = _value;
- response.IsFault = true;
- break;
- case PARAM:
- response.Value = _value;
- _value = null;
- _text = null;
- break;
- }
- break;
- default:
- break;
- }
- }
- }
- return response;
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcResponseSerializer.cs b/Common/XmlRpcCS/XmlRpcResponseSerializer.cs
deleted file mode 100644
index 72ca56819e..0000000000
--- a/Common/XmlRpcCS/XmlRpcResponseSerializer.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.Xml;
-
- /// Class responsible for serializing an XML-RPC response.
- /// This class handles the response envelope, depending on XmlRpcSerializer
- /// to serialize the payload.
- ///
- public class XmlRpcResponseSerializer : XmlRpcSerializer
- {
- static private XmlRpcResponseSerializer _singleton;
- /// A static singleton instance of this deserializer.
- static public XmlRpcResponseSerializer Singleton
- {
- get
- {
- if (_singleton == null)
- _singleton = new XmlRpcResponseSerializer();
-
- return _singleton;
- }
- }
-
- /// Serialize the XmlRpcResponse to the output stream.
- /// An XmlTextWriter stream to write data to.
- /// An Object to serialize.
- ///
- override public void Serialize(XmlTextWriter output, Object obj)
- {
- XmlRpcResponse response = (XmlRpcResponse)obj;
-
- output.WriteStartDocument();
- output.WriteStartElement(METHOD_RESPONSE);
-
- if (response.IsFault)
- output.WriteStartElement(FAULT);
- else
- {
- output.WriteStartElement(PARAMS);
- output.WriteStartElement(PARAM);
- }
-
- output.WriteStartElement(VALUE);
-
- SerializeObject(output, response.Value);
-
- output.WriteEndElement();
-
- output.WriteEndElement();
- if (!response.IsFault)
- output.WriteEndElement();
- output.WriteEndElement();
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcSerializer.cs b/Common/XmlRpcCS/XmlRpcSerializer.cs
deleted file mode 100644
index 0643d38411..0000000000
--- a/Common/XmlRpcCS/XmlRpcSerializer.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- /// Base class of classes serializing data to XML-RPC's XML format.
- /// This class handles the basic type conversions like Integer to <i4>.
- ///
- public class XmlRpcSerializer : XmlRpcXmlTokens
- {
-
- /// Serialize the XmlRpcRequest to the output stream.
- /// An XmlTextWriter stream to write data to.
- /// An Object to serialize.
- ///
- virtual public void Serialize(XmlTextWriter output, Object obj)
- {
- }
-
- /// Serialize the XmlRpcRequest to a String.
- /// Note this may represent a real memory hog for a large request.
- /// An Object to serialize.
- /// String containing XML-RPC representation of the request.
- ///
- public String Serialize(Object obj)
- {
- StringWriter strBuf = new StringWriter();
- XmlTextWriter xml = new XmlTextWriter(strBuf);
- xml.Formatting = Formatting.Indented;
- xml.Indentation = 4;
- Serialize(xml, obj);
- xml.Flush();
- String returns = strBuf.ToString();
- xml.Close();
- return returns;
- }
-
- /// Serialize the object to the output stream.
- /// An XmlTextWriter stream to write data to.
- /// An Object to serialize.
- public void SerializeObject(XmlTextWriter output, Object obj)
- {
- if (obj == null)
- return;
-
- if (obj is byte[])
- {
- byte[] ba = (byte[])obj;
- output.WriteStartElement(BASE64);
- output.WriteBase64(ba, 0, ba.Length);
- output.WriteEndElement();
- }
- else if (obj is String)
- {
- output.WriteElementString(STRING, obj.ToString());
- }
- else if (obj is Int32)
- {
- output.WriteElementString(INT, obj.ToString());
- }
- else if (obj is DateTime)
- {
- output.WriteElementString(DATETIME, ((DateTime)obj).ToString(ISO_DATETIME));
- }
- else if (obj is Double)
- {
- output.WriteElementString(DOUBLE, obj.ToString());
- }
- else if (obj is Boolean)
- {
- output.WriteElementString(BOOLEAN, ((((Boolean)obj) == true) ? "1" : "0"));
- }
- else if (obj is IList)
- {
- output.WriteStartElement(ARRAY);
- output.WriteStartElement(DATA);
- if (((ArrayList)obj).Count > 0)
- {
- foreach (Object member in ((IList)obj))
- {
- output.WriteStartElement(VALUE);
- SerializeObject(output, member);
- output.WriteEndElement();
- }
- }
- output.WriteEndElement();
- output.WriteEndElement();
- }
- else if (obj is IDictionary)
- {
- IDictionary h = (IDictionary)obj;
- output.WriteStartElement(STRUCT);
- foreach (String key in h.Keys)
- {
- output.WriteStartElement(MEMBER);
- output.WriteElementString(NAME, key);
- output.WriteStartElement(VALUE);
- SerializeObject(output, h[key]);
- output.WriteEndElement();
- output.WriteEndElement();
- }
- output.WriteEndElement();
- }
-
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcServer.cs b/Common/XmlRpcCS/XmlRpcServer.cs
deleted file mode 100644
index 1c226c1ba5..0000000000
--- a/Common/XmlRpcCS/XmlRpcServer.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.IO;
- using System.Net;
- using System.Net.Sockets;
- using System.Text;
- using System.Threading;
- using System.Xml;
-
- /// A restricted HTTP server for use with XML-RPC.
- /// It only handles POST requests, and only POSTs representing XML-RPC calls.
- /// In addition to dispatching requests it also provides a registry for request handlers.
- ///
- public class XmlRpcServer : IEnumerable
- {
-#pragma warning disable 0414 // disable "private field assigned but not used"
- const int RESPONDER_COUNT = 10;
- private TcpListener _myListener;
- private int _port;
- private IPAddress _address;
- private IDictionary _handlers;
- private XmlRpcSystemObject _system;
- private WaitCallback _wc;
-#pragma warning restore 0414
-
- ///Constructor with port and address.
- ///This constructor sets up a TcpListener listening on the
- ///given port and address. It also calls a Thread on the method StartListen().
- ///IPAddress value of the address to listen on.
- ///Int value of the port to listen on.
- public XmlRpcServer(IPAddress address, int port)
- {
- _port = port;
- _address = address;
- _handlers = new Hashtable();
- _system = new XmlRpcSystemObject(this);
- _wc = new WaitCallback(WaitCallback);
- }
-
- ///Basic constructor.
- ///This constructor sets up a TcpListener listening on the
- ///given port. It also calls a Thread on the method StartListen(). IPAddress.Any
- ///is assumed as the address here.
- ///Int value of the port to listen on.
- public XmlRpcServer(int port) : this(IPAddress.Any, port) { }
-
- /// Start the server.
- public void Start()
- {
- try
- {
- Stop();
- //start listing on the given port
- // IPAddress addr = IPAddress.Parse("127.0.0.1");
- lock (this)
- {
- _myListener = new TcpListener(IPAddress.Any, _port);
- _myListener.Start();
- //start the thread which calls the method 'StartListen'
- Thread th = new Thread(new ThreadStart(StartListen));
- th.Start();
- }
- }
- catch (Exception e)
- {
- Logger.WriteEntry("An Exception Occurred while Listening :" + e.ToString(), LogLevel.Error);
- }
- }
-
- /// Stop the server.
- public void Stop()
- {
- try
- {
- if (_myListener != null)
- {
- lock (this)
- {
- _myListener.Stop();
- _myListener = null;
- }
- }
- }
- catch (Exception e)
- {
- Logger.WriteEntry("An Exception Occurred while stopping :" +
- e.ToString(), LogLevel.Error);
- }
- }
-
- /// Get an enumeration of my XML-RPC handlers.
- /// IEnumerable the handler enumeration.
- public IEnumerator GetEnumerator()
- {
- return _handlers.GetEnumerator();
- }
-
- /// Retrieve a handler by name.
- /// String naming a handler
- /// Object that is the handler.
- public Object this[String name]
- {
- get { return _handlers[name]; }
- }
-
- ///
- ///This method Accepts new connections and dispatches them when appropriate.
- ///
- public void StartListen()
- {
- while (true && _myListener != null)
- {
- //Accept a new connection
- XmlRpcResponder responder = new XmlRpcResponder(this, _myListener.AcceptTcpClient());
- ThreadPool.QueueUserWorkItem(_wc, responder);
- }
- }
-
-
- ///
- ///Add an XML-RPC handler object by name.
- ///
- ///String XML-RPC dispatch name of this object.
- ///Object The object that is the XML-RPC handler.
- public void Add(String name, Object obj)
- {
- _handlers.Add(name, obj);
- }
-
- ///Return a C# object.method name for and XML-RPC object.method name pair.
- ///The XML-RPC object.method.
- ///String of form object.method for the underlying C# method.
- public String MethodName(String methodName)
- {
- int dotAt = methodName.LastIndexOf('.');
-
- if (dotAt == -1)
- {
- throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
- XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Bad method name " + methodName);
- }
-
- String objectName = methodName.Substring(0, dotAt);
- Object target = _handlers[objectName];
-
- if (target == null)
- {
- throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
- XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Object " + objectName + " not found");
- }
-
- return target.GetType().FullName + "." + methodName.Substring(dotAt + 1);
- }
-
- ///Invoke a method described in a request.
- ///XmlRpcRequest containing a method descriptions.
- ///
- ///
- public Object Invoke(XmlRpcRequest req)
- {
- return Invoke(req.MethodNameObject, req.MethodNameMethod, req.Params);
- }
-
- ///Invoke a method on a named handler.
- ///String The name of the handler.
- ///String The name of the method to invoke on the handler.
- ///IList The parameters to invoke the method with.
- ///
- public Object Invoke(String objectName, String methodName, IList parameters)
- {
- Object target = _handlers[objectName];
-
- if (target == null)
- {
- throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
- XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Object " + objectName + " not found");
- }
-
- return XmlRpcSystemObject.Invoke(target, methodName, parameters);
- }
-
- /// The method the thread pool invokes when a thread is available to handle an HTTP request.
- /// TcpClient from the socket accept.
- public void WaitCallback(object responder)
- {
- XmlRpcResponder resp = (XmlRpcResponder)responder;
-
- if (resp.HttpReq.HttpMethod == "POST")
- {
- try
- {
- resp.Respond();
- }
- catch (Exception e)
- {
- Logger.WriteEntry("Failed on post: " + e, LogLevel.Error);
- }
- }
- else
- {
- Logger.WriteEntry("Only POST methods are supported: " + resp.HttpReq.HttpMethod +
- " ignored", LogLevel.Error);
- }
-
- resp.Close();
- }
-
- ///
- /// This function send the Header Information to the client (Browser)
- ///
- /// HTTP Version
- /// Mime Type
- /// Total Bytes to be sent in the body
- ///
- /// Socket reference
- static public void HttpHeader(string sHttpVersion, string sMIMEHeader, long iTotBytes, string sStatusCode, TextWriter output)
- {
- String sBuffer = "";
-
- // if Mime type is not provided set default to text/html
- if (sMIMEHeader.Length == 0)
- {
- sMIMEHeader = "text/html"; // Default Mime Type is text/html
- }
-
- sBuffer += sHttpVersion + sStatusCode + "\r\n";
- sBuffer += "Connection: close\r\n";
- if (iTotBytes > 0)
- sBuffer += "Content-Length: " + iTotBytes + "\r\n";
- sBuffer += "Server: XmlRpcServer \r\n";
- sBuffer += "Content-Type: " + sMIMEHeader + "\r\n";
- sBuffer += "\r\n";
-
- output.Write(sBuffer);
- }
- }
-}
diff --git a/Common/XmlRpcCS/XmlRpcSystemObject.cs b/Common/XmlRpcCS/XmlRpcSystemObject.cs
deleted file mode 100644
index 5f799514c6..0000000000
--- a/Common/XmlRpcCS/XmlRpcSystemObject.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
- using System.Collections;
- using System.Reflection;
-
- /// XML-RPC System object implementation of extended specifications.
- [XmlRpcExposed]
- public class XmlRpcSystemObject
- {
- private XmlRpcServer _server;
- static private IDictionary _methodHelp = new Hashtable();
-
- /// Static IDictionary to hold mappings of method name to associated documentation String
- static public IDictionary MethodHelp
- {
- get { return _methodHelp; }
- }
-
- /// Constructor.
- /// XmlRpcServer server to be the system object for.
- public XmlRpcSystemObject(XmlRpcServer server)
- {
- _server = server;
- server.Add("system", this);
- _methodHelp.Add(this.GetType().FullName + ".methodHelp", "Return a string description.");
- }
-
- /// Invoke a method on a given object.
- /// Using reflection, and respecting the XmlRpcExposed attribute,
- /// invoke the methodName method on the target
- /// instance with the parameters provided. All this packages other Invoke methods
- /// end up calling this.
- /// Object the value the invoked method returns.
- /// If method does not exist, is not exposed, parameters invalid, or invocation
- /// results in an exception. Note, the XmlRpcException.Code will indicate cause.
- static public Object Invoke(Object target, String methodName, IList parameters)
- {
- if (target == null)
- throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
- XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Invalid target object.");
-
- Type type = target.GetType();
- MethodInfo method = type.GetMethod(methodName);
-
- try
- {
- if (!XmlRpcExposedAttribute.ExposedMethod(target, methodName))
- throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
- XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": Method " + methodName + " is not exposed.");
- }
- catch (MissingMethodException me)
- {
- throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_METHOD,
- XmlRpcErrorCodes.SERVER_ERROR_METHOD_MSG + ": " + me.Message);
- }
-
- Object[] args = new Object[parameters.Count];
-
- int index = 0;
- foreach (Object arg in parameters)
- {
- args[index] = arg;
- index++;
- }
-
- try
- {
- Object retValue = method.Invoke(target, args);
- if (retValue == null)
- throw new XmlRpcException(XmlRpcErrorCodes.APPLICATION_ERROR,
- XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": Method returned NULL.");
- return retValue;
- }
- catch (XmlRpcException e)
- {
- throw e;
- }
- catch (ArgumentException ae)
- {
- Logger.WriteEntry(XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": " + ae.Message,
- LogLevel.Information);
- String call = methodName + "( ";
- foreach (Object o in args)
- {
- call += o.GetType().Name;
- call += " ";
- }
- call += ")";
- throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_PARAMS,
- XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": Arguement type mismatch invoking " + call);
- }
- catch (TargetParameterCountException tpce)
- {
- Logger.WriteEntry(XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": " + tpce.Message,
- LogLevel.Information);
- throw new XmlRpcException(XmlRpcErrorCodes.SERVER_ERROR_PARAMS,
- XmlRpcErrorCodes.SERVER_ERROR_PARAMS_MSG + ": Arguement count mismatch invoking " + methodName);
- }
- catch (TargetInvocationException tie)
- {
- throw new XmlRpcException(XmlRpcErrorCodes.APPLICATION_ERROR,
- XmlRpcErrorCodes.APPLICATION_ERROR_MSG + " Invoked method " + methodName + ": " + tie.Message);
- }
- }
-
- /// List methods available on all handlers of this server.
- /// IList An array of Strings, each String will have form "object.method".
- [XmlRpcExposed]
- public IList listMethods()
- {
- IList methods = new ArrayList();
- Boolean considerExposure;
-
- foreach (DictionaryEntry handlerEntry in _server)
- {
- considerExposure = XmlRpcExposedAttribute.IsExposed(handlerEntry.Value.GetType());
-
- foreach (MemberInfo mi in handlerEntry.Value.GetType().GetMembers())
- {
- if (mi.MemberType != MemberTypes.Method)
- continue;
-
- if (!((MethodInfo)mi).IsPublic)
- continue;
-
- if (considerExposure && !XmlRpcExposedAttribute.IsExposed(mi))
- continue;
-
- methods.Add(handlerEntry.Key + "." + mi.Name);
- }
- }
-
- return methods;
- }
-
- /// Given a method name return the possible signatures for it.
- /// String The object.method name to look up.
- /// IList Of arrays of signatures.
- [XmlRpcExposed]
- public IList methodSignature(String name)
- {
- IList signatures = new ArrayList();
- int index = name.IndexOf('.');
-
- if (index < 0)
- return signatures;
-
- String oName = name.Substring(0, index);
- Object obj = _server[oName];
-
- if (obj == null)
- return signatures;
-
- MemberInfo[] mi = obj.GetType().GetMember(name.Substring(index + 1));
-
- if (mi == null || mi.Length != 1) // for now we want a single signature
- return signatures;
-
- MethodInfo method;
-
- try
- {
- method = (MethodInfo)mi[0];
- }
- catch (Exception e)
- {
- Logger.WriteEntry("Attempted methodSignature call on " + mi[0] + " caused: " + e,
- LogLevel.Information);
- return signatures;
- }
-
- if (!method.IsPublic)
- return signatures;
-
- IList signature = new ArrayList();
- signature.Add(method.ReturnType.Name);
-
- foreach (ParameterInfo param in method.GetParameters())
- {
- signature.Add(param.ParameterType.Name);
- }
-
-
- signatures.Add(signature);
-
- return signatures;
- }
-
- /// Help for given method signature. Not implemented yet.
- /// String The object.method name to look up.
- /// String help text. Rich HTML text.
- [XmlRpcExposed]
- public String methodHelp(String name)
- {
- String help = null;
-
- try
- {
- help = (String)_methodHelp[_server.MethodName(name)];
- }
- catch (XmlRpcException e)
- {
- throw e;
- }
- catch (Exception) { /* ignored */ };
-
- if (help == null)
- help = "No help available for: " + name;
-
- return help;
- }
-
- /// Boxcarring support method.
- /// IList of calls
- /// ArrayList of results/faults.
- [XmlRpcExposed]
- public IList multiCall(IList calls)
- {
- IList responses = new ArrayList();
- XmlRpcResponse fault = new XmlRpcResponse();
-
- foreach (IDictionary call in calls)
- {
- try
- {
- XmlRpcRequest req = new XmlRpcRequest((String)call[XmlRpcXmlTokens.METHOD_NAME],
- (ArrayList)call[XmlRpcXmlTokens.PARAMS]);
- Object results = _server.Invoke(req);
- IList response = new ArrayList();
- response.Add(results);
- responses.Add(response);
- }
- catch (XmlRpcException e)
- {
- fault.SetFault(e.FaultCode, e.FaultString);
- responses.Add(fault.Value);
- }
- catch (Exception e2)
- {
- fault.SetFault(XmlRpcErrorCodes.APPLICATION_ERROR,
- XmlRpcErrorCodes.APPLICATION_ERROR_MSG + ": " + e2.Message);
- responses.Add(fault.Value);
- }
- }
-
- return responses;
- }
-
- }
-}
-
diff --git a/Common/XmlRpcCS/XmlRpcXmlTokens.cs b/Common/XmlRpcCS/XmlRpcXmlTokens.cs
deleted file mode 100644
index 50788bd5a4..0000000000
--- a/Common/XmlRpcCS/XmlRpcXmlTokens.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-namespace Nwc.XmlRpc
-{
- using System;
-
- /// Class collecting String tokens that are part of XML-RPC files.
- public class XmlRpcXmlTokens
- {
- /// C# formatting string to describe an ISO 8601 date.
- public const String ISO_DATETIME = "yyyyMMdd\\THH\\:mm\\:ss";
- /// Base64 field indicator.
- /// Corresponds to the <base64> tag.
- public const String BASE64 = "base64";
- /// String field indicator.
- /// Corresponds to the <string> tag.
- public const String STRING = "string";
- /// Integer field integer.
- /// Corresponds to the <i4> tag.
- public const String INT = "i4";
- /// Alternate integer field indicator.
- /// Corresponds to the <int> tag.
- public const String ALT_INT = "int";
- /// Date field indicator.
- /// Corresponds to the <dateTime.iso8601> tag.
- public const String DATETIME = "dateTime.iso8601";
- /// Boolean field indicator.
- /// Corresponds to the <boolean> tag.
- public const String BOOLEAN = "boolean";
- /// Value token.
- /// Corresponds to the <value> tag.
- public const String VALUE = "value";
- /// Name token.
- /// Corresponds to the <name> tag.
- public const String NAME = "name";
- /// Array field indicator..
- /// Corresponds to the <array> tag.
- public const String ARRAY = "array";
- /// Data token.
- /// Corresponds to the <data> tag.
- public const String DATA = "data";
- /// Member token.
- /// Corresponds to the <member> tag.
- public const String MEMBER = "member";
- /// Stuct field indicator.
- /// Corresponds to the <struct> tag.
- public const String STRUCT = "struct";
- /// Double field indicator.
- /// Corresponds to the <double> tag.
- public const String DOUBLE = "double";
- /// Param token.
- /// Corresponds to the <param> tag.
- public const String PARAM = "param";
- /// Params token.
- /// Corresponds to the <params> tag.
- public const String PARAMS = "params";
- /// MethodCall token.
- /// Corresponds to the <methodCall> tag.
- public const String METHOD_CALL = "methodCall";
- /// MethodName token.
- /// Corresponds to the <methodName> tag.
- public const String METHOD_NAME = "methodName";
- /// MethodResponse token
- /// Corresponds to the <methodResponse> tag.
- public const String METHOD_RESPONSE = "methodResponse";
- /// Fault response token.
- /// Corresponds to the <fault> tag.
- public const String FAULT = "fault";
- /// FaultCode token.
- /// Corresponds to the <faultCode> tag.
- public const String FAULT_CODE = "faultCode";
- /// FaultString token.
- /// Corresponds to the <faultString> tag.
- public const String FAULT_STRING = "faultString";
- }
-}
-
-
diff --git a/OpenGridServices.build b/OpenGridServices.build
index 7cfe21e851..2efeac9a8e 100644
--- a/OpenGridServices.build
+++ b/OpenGridServices.build
@@ -46,33 +46,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -83,18 +83,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index e492872a5d..2343bc085d 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,28 +1,28 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.DB4o", "Common\OpenGrid.Framework.Data.DB4o\OpenGrid.Framework.Data.DB4o.csproj", "{39BD9497-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.MSSQL", "OpenSim\Framework\Data.MSSQL\OpenSim.Framework.Data.MSSQL.csproj", "{17F7F694-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MSSQL", "OpenGridServices\OpenGrid.Framework.Data.MSSQL\OpenGrid.Framework.Data.MSSQL.csproj", "{0A563AC1-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.MySQL", "OpenSim\Framework\Data.MySQL\OpenSim.Framework.Data.MySQL.csproj", "{17F7F6BE-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.SQLite", "OpenSim\Framework\Data.SQLite\OpenSim.Framework.Data.SQLite.csproj", "{6ECC56A9-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.SQLite", "OpenGridServices\OpenGrid.Framework.Data.SQLite\OpenGrid.Framework.Data.SQLite.csproj", "{1E3F341A-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.UserManagement", "OpenSim\Framework\UserManager\OpenSim.Framework.UserManagement.csproj", "{586E2916-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Manager", "OpenGridServices\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj", "{7924FD35-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.AssetServer", "OpenSim\Grid\AssetServer\OpenSim.Grid.AssetServer.csproj", "{E5F1A03B-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.UserManagement", "Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj", "{DA9A7391-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.Framework.Manager", "OpenSim\Grid\Framework.Manager\OpenSim.Grid.Framework.Manager.csproj", "{4B7BFD1C-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.GridServer", "OpenSim\Grid\GridServer\OpenSim.Grid.GridServer.csproj", "{60FCC3A6-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices\OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.GridServer.Config", "OpenSim\Grid\GridServer.Config\OpenSim.Grid.GridServer.Config.csproj", "{1442B635-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices\OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer", "OpenSim\Grid\UserServer\OpenSim.Grid.UserServer.csproj", "{2FC96F92-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,64 +30,65 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- ({39BD9497-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
- ({0A563AC1-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})
- ({0F3C3AC1-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
- ({1E3F341A-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})
- ({DA9A7391-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
- ({21BFC8E2-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
- ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({7924FD35-0000-0000-0000-000000000000})
- ({66591469-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
+ ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
+ ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
deleted file mode 100644
index c1fc2daef8..0000000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {0F3C3AC1-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data.MySQL
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data.MySQL
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\MySql.Data.dll
- False
-
-
- System.dll
- False
-
-
- System.Data.dll
- False
-
-
- System.Xml.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.r858 b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.r858
deleted file mode 100644
index 7a36be22c7..0000000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.r858
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {C669E5AC-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data.MySQL
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data.MySQL
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ../../bin/
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ../../bin/
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\MySql.Data.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {12DD8EB8-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.r921 b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.r921
deleted file mode 100644
index 5fe0cf78b4..0000000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.r921
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {0F3C3AC1-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data.MySQL
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data.MySQL
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\MySql.Data.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
deleted file mode 100644
index da42e05eeb..0000000000
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {1E3F341A-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data.SQLite
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data.SQLite
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- System.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\System.Data.SQLite.dll
- False
-
-
- System.Xml.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.mine b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.mine
deleted file mode 100644
index 463cf86c2c..0000000000
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.mine
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {1E3F341A-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data.SQLite
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data.SQLite
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\System.Data.SQLite.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.r858 b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.r858
deleted file mode 100644
index a8d0541d38..0000000000
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.r858
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {0ED96822-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data.SQLite
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data.SQLite
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ../../bin/
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ../../bin/
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\System.Data.SQLite.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {12DD8EB8-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
deleted file mode 100644
index 9430ab94ea..0000000000
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.mine b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.mine
deleted file mode 100644
index 257f6e1c9f..0000000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.mine
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {0021261B-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGridServices.AssetServer
- JScript
- Grid
- IE50
- false
- Exe
-
- OpenGridServices.AssetServer
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Data.dll
- False
-
-
- System.Xml.dll
- False
-
-
- OpenSim.Framework.dll
- False
-
-
- OpenSim.Framework.Console.dll
- False
-
-
- OpenSim.GridInterfaces.Local.dll
- False
-
-
- OpenSim.Servers.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\Db4objects.Db4o.dll
- False
-
-
- XMLRPC.dll
- False
-
-
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.r858 b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.r858
deleted file mode 100644
index 2b382c41a8..0000000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.r858
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {7CDDE593-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGridServices.AssetServer
- JScript
- Grid
- IE50
- false
- Exe
-
- OpenGridServices.AssetServer
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ../../bin/
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ../../bin/
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Data.dll
- False
-
-
- System.Xml.dll
- False
-
-
- OpenSim.Framework.dll
- False
-
-
- OpenSim.Framework.Console.dll
- False
-
-
- OpenSim.GridInterfaces.Local.dll
- False
-
-
- OpenSim.Servers.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\Db4objects.Db4o.dll
- False
-
-
- XMLRPC.dll
- False
-
-
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.r921 b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.r921
deleted file mode 100644
index 031e405924..0000000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.r921
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {0021261B-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGridServices.AssetServer
- JScript
- Grid
- IE50
- false
- Exe
-
- OpenGridServices.AssetServer
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Data.dll
- False
-
-
- System.Xml.dll
- False
-
-
- OpenSim.Framework.dll
- False
-
-
- OpenSim.Framework.Console.dll
- False
-
-
- OpenSim.GridInterfaces.Local.dll
- False
-
-
- OpenSim.Servers.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\Db4objects.Db4o.dll
- False
-
-
- XMLRPC.dll
- False
-
-
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
deleted file mode 100644
index 9b8cc87b34..0000000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {21BFC8E2-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGridServices.GridServer
- JScript
- Grid
- IE50
- false
- Exe
-
- OpenGridServices.GridServer
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Data.dll
- False
-
-
- System.Xml.dll
- False
-
-
- ..\bin\libsecondlife.dll
- False
-
-
- ..\bin\Db4objects.Db4o.dll
- False
-
-
-
-
- OpenSim.Framework
- {8ACA2445-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Framework.Console
- {A7CD0630-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Servers
- {8BB20F0A-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- XMLRPC
- {8E81D43C-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
deleted file mode 100644
index 6bef534866..0000000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj
deleted file mode 100644
index 6aec357c19..0000000000
--- a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.csproj
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {338FA00B-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGridServices.InventoryServer
- JScript
- Grid
- IE50
- false
- Exe
-
- OpenGridServices.InventoryServer
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Data.dll
- False
-
-
- System.Xml.dll
- False
-
-
- OpenSim.Framework.dll
- False
-
-
- OpenSim.Framework.Console.dll
- False
-
-
- OpenSim.GridInterfaces.Local.dll
- False
-
-
- OpenSim.Servers.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\Db4objects.Db4o.dll
- False
-
-
- XMLRPC.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
deleted file mode 100644
index c23a862adc..0000000000
--- a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenGridServices/OpenGridServices.UserServer/OGS-UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OGS-UserServer.csproj
deleted file mode 100644
index f4fa8b6403..0000000000
--- a/OpenGridServices/OpenGridServices.UserServer/OGS-UserServer.csproj
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
- Debug
- AnyCPU
- 8.0.50727
- 2.0
- {D45B6E48-5668-478D-B9CB-6D46E665FACF}
- Exe
- Properties
- OGS_UserServer
- OGS-UserServer
- OpenGridServices.OpenUser_Main
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- False
- ..\..\common\bin\libsecondlife.dll
-
-
-
-
-
-
-
- OGS-Console.cs
-
-
- VersionInfo.cs
-
-
-
-
-
-
-
-
- {2E46A825-3168-492F-93BC-637126B5B72B}
- OpenSim.Framework
-
-
- {7667E6E2-F227-41A2-B1B2-315613E1BAFC}
- ServerConsole
-
-
-
-
\ No newline at end of file
diff --git a/OpenSim.build b/OpenSim.build
index d84663a0ac..5803b426a4 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -46,61 +46,61 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -111,32 +111,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.sln b/OpenSim.sln
index 6ae399201f..93a022df44 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,169 +1,249 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications.OGS1", "Common\OpenGrid.Framework.Communications.OGS1\OpenGrid.Framework.Communications.OGS1.csproj", "{17442AF1-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Communications", "OpenSim\Framework\Communications\OpenSim.Framework.Communications.csproj", "{CB52B7E7-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.DB4o", "Common\OpenGrid.Framework.Data.DB4o\OpenGrid.Framework.Data.DB4o.csproj", "{39BD9497-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim\Framework\Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.UserManagement", "Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj", "{DA9A7391-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Caches", "OpenSim\OpenSim.Caches\OpenSim.Caches.csproj", "{1938EB12-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.GenericConfig.Xml", "OpenSim\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj", "{C74E4A30-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "Common\OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Servers", "OpenSim\Framework\Servers\OpenSim.Framework.Servers.csproj", "{2CC71860-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.UserManagement", "OpenSim\Framework\UserManager\OpenSim.Framework.UserManagement.csproj", "{586E2916-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml", "Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj", "{E88EF749-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Caches", "OpenSim\Region\Caches\OpenSim.Region.Caches.csproj", "{61FCCDB3-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Capabilities", "OpenSim\Region\Capabilities\OpenSim.Region.Capabilities.csproj", "{39038E85-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim\OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.ClientStack", "OpenSim\Region\ClientStack\OpenSim.Region.ClientStack.csproj", "{DC3698B2-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.LocalCommunications", "OpenSim\OpenSim.LocalCommunications\OpenSim.LocalCommunications.csproj", "{79CED992-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.Local", "OpenSim\Region\Communications\Local\OpenSim.Region.Communications.Local.csproj", "{BFB5D807-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim\OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{4F874463-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{4806E378-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Environment\OpenSim.Region.Environment.csproj", "{DCBA491C-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim\OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Local", "OpenSim\Region\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj", "{241A8CDD-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim\OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Remote", "OpenSim\Region\GridInterfaces\Remote\OpenSim.Region.GridInterfaces.Remote.csproj", "{98C7B681-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region", "OpenSim\OpenSim.Region\OpenSim.Region.csproj", "{196916AF-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.BasicPhysicsPlugin", "OpenSim\Region\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj", "{15B4FEF3-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim\OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.Manager", "OpenSim\Region\Physics\Manager\OpenSim.Region.Physics.Manager.csproj", "{F4FF31EB-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Common\OpenSim.Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.OdePlugin", "OpenSim\Region\Physics\OdePlugin\OpenSim.Region.Physics.OdePlugin.csproj", "{90620634-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.PhysXPlugin", "OpenSim\Region\Physics\PhysXPlugin\OpenSim.Region.Physics.PhysXPlugin.csproj", "{A6D191D8-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim\OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{E1B79ECF-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageBerkeleyDB", "OpenSim\Region\Storage\LocalStorageBerkeleyDB\OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj", "{A4691E59-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageSQLite", "OpenSim\OpenSim.Storage\LocalStorageSQLite\OpenSim.Storage.LocalStorageSQLite.csproj", "{6B20B603-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageDb4o", "OpenSim\Region\Storage\LocalStorageDb4o\OpenSim.Region.Storage.LocalStorageDb4o.csproj", "{43DB702D-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageSQLite", "OpenSim\Region\Storage\LocalStorageSQLite\OpenSim.Region.Storage.LocalStorageSQLite.csproj", "{477B9270-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Terrain.BasicTerrain", "OpenSim\Region\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj", "{C9E0F891-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"
EndProject
Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {17442AF1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {17442AF1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {17442AF1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {17442AF1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectDependencies) = postSolution
+ ({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).6 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).9 = ({586E2916-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).10 = ({61FCCDB3-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).11 = ({DC3698B2-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).12 = ({BFB5D807-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).13 = ({4806E378-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).14 = ({DCBA491C-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).15 = ({F4FF31EB-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).16 = ({C9E0F891-0000-0000-0000-000000000000})
+ ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({C74E4A30-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({586E2916-0000-0000-0000-000000000000}).5 = ({C74E4A30-0000-0000-0000-000000000000})
+ ({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000})
+ ({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({39038E85-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({39038E85-0000-0000-0000-000000000000}).2 = ({2CC71860-0000-0000-0000-000000000000})
+ ({39038E85-0000-0000-0000-000000000000}).3 = ({61FCCDB3-0000-0000-0000-000000000000})
+ ({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
+ ({DC3698B2-0000-0000-0000-000000000000}).6 = ({61FCCDB3-0000-0000-0000-000000000000})
+ ({DC3698B2-0000-0000-0000-000000000000}).7 = ({F4FF31EB-0000-0000-0000-000000000000})
+ ({DC3698B2-0000-0000-0000-000000000000}).8 = ({C9E0F891-0000-0000-0000-000000000000})
+ ({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+ ({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000})
+ ({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+ ({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+ ({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
+ ({DCBA491C-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({DCBA491C-0000-0000-0000-000000000000}).5 = ({CB52B7E7-0000-0000-0000-000000000000})
+ ({DCBA491C-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({DCBA491C-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000})
+ ({DCBA491C-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000})
+ ({DCBA491C-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000})
+ ({DCBA491C-0000-0000-0000-000000000000}).10 = ({39038E85-0000-0000-0000-000000000000})
+ ({DCBA491C-0000-0000-0000-000000000000}).11 = ({F4FF31EB-0000-0000-0000-000000000000})
+ ({DCBA491C-0000-0000-0000-000000000000}).12 = ({C9E0F891-0000-0000-0000-000000000000})
+ ({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
+ ({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000})
+ ({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
+ ({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+ ({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000})
+ ({24B12448-0000-0000-0000-000000000000}).5 = ({61FCCDB3-0000-0000-0000-000000000000})
+ ({24B12448-0000-0000-0000-000000000000}).6 = ({DC3698B2-0000-0000-0000-000000000000})
+ ({24B12448-0000-0000-0000-000000000000}).7 = ({BFB5D807-0000-0000-0000-000000000000})
+ ({24B12448-0000-0000-0000-000000000000}).8 = ({DCBA491C-0000-0000-0000-000000000000})
+ ({24B12448-0000-0000-0000-000000000000}).9 = ({241A8CDD-0000-0000-0000-000000000000})
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
EndGlobal
diff --git a/OpenSim/OpenSim.Region/Scenes/SceneEvents.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
similarity index 56%
rename from OpenSim/OpenSim.Region/Scenes/SceneEvents.cs
rename to OpenSim/Framework/Communications/CommunicationsManager.cs
index 4b39e51d8c..b17b37b953 100644
--- a/OpenSim/OpenSim.Region/Scenes/SceneEvents.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -26,54 +26,45 @@
*
*/
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Text;
+using OpenSim.Framework;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using libsecondlife;
+using libsecondlife.Packets;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Framework.Communications
{
- ///
- /// A class for triggering remote scene events.
- ///
- public class EventManager
+
+ public class CommunicationsManager
{
- public delegate void OnFrameDelegate();
- public event OnFrameDelegate OnFrame;
+ public IUserServices UserServer;
+ public IGridServices GridServer;
+ public IInterRegionCommunications InterRegion;
- public delegate void OnNewPresenceDelegate(ScenePresence presence);
- public event OnNewPresenceDelegate OnNewPresence;
-
- public delegate void OnNewPrimitiveDelegate(Primitive prim);
- public event OnNewPrimitiveDelegate OnNewPrimitive;
-
- public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);
- public event OnRemovePresenceDelegate OnRemovePresence;
-
- public void TriggerOnFrame()
+ public NetworkServersInfo ServersInfo;
+ public CommunicationsManager(NetworkServersInfo serversInfo)
{
- if (OnFrame != null)
+ ServersInfo = serversInfo;
+ }
+
+ #region Packet Handlers
+ public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
+ {
+ UserProfileData profileData = this.UserServer.GetUserProfile(uuid);
+ if (profileData != null)
{
- OnFrame();
- }
- }
-
- public void TriggerOnNewPrimitive(Primitive prim)
- {
- if (OnNewPrimitive != null)
- OnNewPrimitive(prim);
- }
-
- public void TriggerOnNewPresence(ScenePresence presence)
- {
- if (OnNewPresence != null)
- OnNewPresence(presence);
- }
-
- public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)
- {
- if (OnRemovePresence != null)
- {
- OnRemovePresence(uuid);
+ UUIDNameReplyPacket packet = new UUIDNameReplyPacket();
+ packet.UUIDNameBlock[0].ID = profileData.UUID;
+ packet.UUIDNameBlock[0].FirstName = libsecondlife.Helpers.StringToField(profileData.username);
+ packet.UUIDNameBlock[0].LastName = libsecondlife.Helpers.StringToField(profileData.surname);
+ remote_client.OutPacket((Packet)packet);
}
+
}
+ #endregion
}
}
diff --git a/Common/OpenGrid.Framework.Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
similarity index 96%
rename from Common/OpenGrid.Framework.Communications/IGridServices.cs
rename to OpenSim/Framework/Communications/IGridServices.cs
index d3b7c07185..a4812fb329 100644
--- a/Common/OpenGrid.Framework.Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -32,7 +32,7 @@ using System.Text;
using OpenSim.Framework.Types;
using OpenSim.Framework;
-namespace OpenGrid.Framework.Communications
+namespace OpenSim.Framework.Communications
{
public class GridInfo
{
diff --git a/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
similarity index 95%
rename from Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
rename to OpenSim/Framework/Communications/IInterRegionCommunications.cs
index 4cb8a38121..7b0d3400d5 100644
--- a/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -31,7 +31,7 @@ using System.Text;
using OpenSim.Framework.Types;
using OpenSim.Framework;
-namespace OpenGrid.Framework.Communications
+namespace OpenSim.Framework.Communications
{
public interface IInterRegionCommunications
{
diff --git a/Common/OpenGrid.Framework.Communications/IUserServices.cs b/OpenSim/Framework/Communications/IUserServices.cs
similarity index 86%
rename from Common/OpenGrid.Framework.Communications/IUserServices.cs
rename to OpenSim/Framework/Communications/IUserServices.cs
index 3d8e79150e..37f4942fa3 100644
--- a/Common/OpenGrid.Framework.Communications/IUserServices.cs
+++ b/OpenSim/Framework/Communications/IUserServices.cs
@@ -30,15 +30,18 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Communications
+namespace OpenSim.Framework.Communications
{
public interface IUserServices
{
UserProfileData GetUserProfile(string firstName, string lastName);
UserProfileData GetUserProfile(string name);
UserProfileData GetUserProfile(LLUUID avatarID);
-
+
+ UserProfileData SetupMasterUser(string firstName, string lastName);
+ UserProfileData SetupMasterUser(string firstName, string lastName, string password);
+
}
}
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
similarity index 83%
rename from Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
rename to OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 9a9568cb6d..31ab172cec 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {683344D5-0000-0000-0000-000000000000}
+ {CB52B7E7-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGrid.Framework.Communications
+ OpenSim.Framework.Communications
JScript
Grid
IE50
false
Library
- OpenGrid.Framework.Communications
+ OpenSim.Framework.Communications
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -72,15 +72,15 @@
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
+
+ OpenSim.Framework
+ {8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Framework
- {8ACA2445-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
similarity index 77%
rename from Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
rename to OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 392220b495..52d29f6065 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -22,16 +22,16 @@
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
similarity index 100%
rename from Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs
rename to OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
diff --git a/Common/OpenSim.Framework.Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs
similarity index 100%
rename from Common/OpenSim.Framework.Console/AssemblyInfo.cs
rename to OpenSim/Framework/Console/AssemblyInfo.cs
diff --git a/Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
similarity index 100%
rename from Common/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
rename to OpenSim/Framework/Console/ConsoleCallbacksBase.cs
diff --git a/Common/OpenSim.Framework.Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
similarity index 100%
rename from Common/OpenSim.Framework.Console/LogBase.cs
rename to OpenSim/Framework/Console/LogBase.cs
diff --git a/Common/OpenSim.Framework.Console/MainLog.cs b/OpenSim/Framework/Console/MainLog.cs
similarity index 100%
rename from Common/OpenSim.Framework.Console/MainLog.cs
rename to OpenSim/Framework/Console/MainLog.cs
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
similarity index 94%
rename from Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
rename to OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index af6c396dfe..f3dcec59e7 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
similarity index 90%
rename from Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
rename to OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
index 7ebdba14ce..eb40c0db4c 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -24,9 +24,9 @@
-
-
-
+
+
+
diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
similarity index 96%
rename from Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
rename to OpenSim/Framework/Data.DB4o/DB4oGridData.cs
index 0e73ab22fb..dc8488ecab 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
@@ -29,11 +29,11 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
using libsecondlife;
-namespace OpenGrid.Framework.Data.DB4o
+namespace OpenSim.Framework.Data.DB4o
{
///
/// A grid server storage mechanism employing the DB4o database system
diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
similarity index 95%
rename from Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
rename to OpenSim/Framework/Data.DB4o/DB4oManager.cs
index 356a49cbd7..3870a8c3bf 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -29,10 +29,10 @@ using System;
using System.Collections.Generic;
using System.Text;
using Db4objects.Db4o;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
using libsecondlife;
-namespace OpenGrid.Framework.Data.DB4o
+namespace OpenSim.Framework.Data.DB4o
{
///
/// A Database manager for Db4o
diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
similarity index 96%
rename from Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
rename to OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 315f48d0ae..8caa75d083 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -28,10 +28,10 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
using libsecondlife;
-namespace OpenGrid.Framework.Data.DB4o
+namespace OpenSim.Framework.Data.DB4o
{
///
/// A User storage interface for the DB4o database system
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
similarity index 84%
rename from Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
rename to OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index d2d6140c67..b09cecf756 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {39BD9497-0000-0000-0000-000000000000}
+ {FD2D303D-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGrid.Framework.Data.DB4o
+ OpenSim.Framework.Data.DB4o
JScript
Grid
IE50
false
Library
- OpenGrid.Framework.Data.DB4o
+ OpenSim.Framework.Data.DB4o
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,11 +59,11 @@
- ..\..\bin\Db4objects.Db4o.dll
+ ..\..\..\bin\Db4objects.Db4o.dll
False
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -80,9 +80,9 @@
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
similarity index 78%
rename from OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
rename to OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index 1a72d0ad95..f124eb5e2b 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,11 +8,13 @@
-
+
-
-
+
+
+
+
@@ -21,9 +23,9 @@
-
-
+
+
diff --git a/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
similarity index 89%
rename from Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
rename to OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
index dc4a9a1dfd..68395a1c98 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.DB4o")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.DB4o")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.DB4o")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.DB4o")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
similarity index 96%
rename from OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
rename to OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
index 1dac4bdbbd..5bdceaf8e5 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
@@ -28,9 +28,9 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.MSSQL
+namespace OpenSim.Framework.Data.MSSQL
{
///
/// A grid data interface for Microsoft SQL Server
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
similarity index 97%
rename from OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
rename to OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index 475a3e7698..7cf1a56205 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -32,9 +32,9 @@ using System.Data;
using System.Data.SqlClient;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.MSSQL
+namespace OpenSim.Framework.Data.MSSQL
{
///
/// A management class for the MS SQL Storage Engine
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
similarity index 84%
rename from OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
rename to OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
index 64bb78ebad..4c41a4f91e 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
+++ b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {0A563AC1-0000-0000-0000-000000000000}
+ {17F7F694-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGrid.Framework.Data.MSSQL
+ OpenSim.Framework.Data.MSSQL
JScript
Grid
IE50
false
Library
- OpenGrid.Framework.Data.MSSQL
+ OpenSim.Framework.Data.MSSQL
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -76,9 +76,9 @@
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
similarity index 79%
rename from OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
rename to OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
index 577da4b7e4..a2b2e3d634 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
+++ b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -20,16 +20,16 @@
-
-
+
+
-
-
-
+
+
+
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
similarity index 89%
rename from OpenGridServices/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
rename to OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
index bbe3cdf372..af310e8f30 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.MSSQL")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.MSSQL")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.MSSQL")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.MSSQL")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
similarity index 96%
rename from OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
rename to OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 4d6cf635b2..43e305438a 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -28,9 +28,9 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
{
///
/// A MySQL Interface for the Grid Server
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
similarity index 96%
rename from OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs
rename to OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index fb429e4213..434df1a02a 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
{
///
/// A MySQL interface for the inventory server
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
similarity index 96%
rename from OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs
rename to OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index c88b39f640..8265614b02 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
{
///
/// An interface to the log database for MySQL
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
similarity index 97%
rename from OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
rename to OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 53b3bdde53..b2f398bb57 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -36,9 +36,9 @@ using MySql.Data;
using MySql.Data.Types;
using MySql.Data.MySqlClient;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
{
///
/// A MySQL Database manager
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
similarity index 96%
rename from OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
rename to OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index 032a0e617a..0304452a83 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -28,10 +28,10 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
using libsecondlife;
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
{
///
/// A database interface class to a user profile storage system
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.mine b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
similarity index 84%
rename from OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.mine
rename to OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 75ef149790..62e3887249 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.mine
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {0F3C3AC1-0000-0000-0000-000000000000}
+ {17F7F6BE-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGrid.Framework.Data.MySQL
+ OpenSim.Framework.Data.MySQL
JScript
Grid
IE50
false
Library
- OpenGrid.Framework.Data.MySQL
+ OpenSim.Framework.Data.MySQL
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -58,31 +58,31 @@
-
- System.dll
+
+ ..\..\..\bin\libsecondlife.dll
False
-
- System.Xml.dll
+
+ ..\..\..\bin\MySql.Data.dll
+ False
+
+
+ System.dll
False
System.Data.dll
False
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\MySql.Data.dll
+
+ System.Xml.dll
False
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
similarity index 78%
rename from OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
rename to OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index a5f40281c7..594ec5266c 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -23,17 +23,17 @@
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
similarity index 89%
rename from OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
rename to OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
index 0bfd1d67bb..d67ccf666c 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.MySQL")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.MySQL")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.MySQL")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.MySQL")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.r921 b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
similarity index 83%
rename from OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.r921
rename to OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index fa17367954..4ba24f11f8 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.r921
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {1E3F341A-0000-0000-0000-000000000000}
+ {6ECC56A9-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGrid.Framework.Data.SQLite
+ OpenSim.Framework.Data.SQLite
JScript
Grid
IE50
false
Library
- OpenGrid.Framework.Data.SQLite
+ OpenSim.Framework.Data.SQLite
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -58,12 +58,12 @@
-
- System.dll
+
+ ..\..\..\bin\libsecondlife.dll
False
-
- System.Xml.dll
+
+ System.dll
False
@@ -71,27 +71,27 @@
False
- ..\..\bin\System.Data.SQLite.dll
+ ..\..\..\bin\System.Data.SQLite.dll
False
-
- ..\..\bin\libsecondlife.dll
+
+ System.Xml.dll
False
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
Code
-
+
Code
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
similarity index 76%
rename from OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
rename to OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index 79b0edfc97..e28d0a6109 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -20,17 +20,17 @@
-
-
+
+
-
+
-
-
-
+
+
+
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
similarity index 89%
rename from OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
rename to OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
index 57c4baedbb..f811825ca4 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.SQLite")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.SQLite")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.SQLite")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.SQLite")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
similarity index 96%
rename from OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
rename to OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index d7a5a69b0a..800e26cf44 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -28,9 +28,9 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.SQLite
+namespace OpenSim.Framework.Data.SQLite
{
///
/// A Grid Interface to the SQLite database
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
similarity index 97%
rename from OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
rename to OpenSim/Framework/Data.SQLite/SQLiteManager.cs
index 968935695a..b67b79cc9b 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -32,9 +32,9 @@ using System.Data;
using System.Data.SQLite;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
-namespace OpenGrid.Framework.Data.SQLite
+namespace OpenSim.Framework.Data.SQLite
{
class SQLiteManager
{
diff --git a/Common/OpenGrid.Framework.Data/GridData.cs b/OpenSim/Framework/Data/GridData.cs
similarity index 96%
rename from Common/OpenGrid.Framework.Data/GridData.cs
rename to OpenSim/Framework/Data/GridData.cs
index b2cce78f02..7f8fdafef0 100644
--- a/Common/OpenGrid.Framework.Data/GridData.cs
+++ b/OpenSim/Framework/Data/GridData.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
{
public enum DataResponse
{
diff --git a/Common/OpenGrid.Framework.Data/ILogData.cs b/OpenSim/Framework/Data/ILogData.cs
similarity index 96%
rename from Common/OpenGrid.Framework.Data/ILogData.cs
rename to OpenSim/Framework/Data/ILogData.cs
index 2ac0bfec0b..ccb3b84fee 100644
--- a/Common/OpenGrid.Framework.Data/ILogData.cs
+++ b/OpenSim/Framework/Data/ILogData.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
{
///
/// The severity of an individual log message
diff --git a/Common/OpenGrid.Framework.Data/IniConfig.cs b/OpenSim/Framework/Data/IniConfig.cs
similarity index 96%
rename from Common/OpenGrid.Framework.Data/IniConfig.cs
rename to OpenSim/Framework/Data/IniConfig.cs
index d17afac967..2f002c12e9 100644
--- a/Common/OpenGrid.Framework.Data/IniConfig.cs
+++ b/OpenSim/Framework/Data/IniConfig.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html
*/
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
{
///
/// Parse settings from ini-like files
diff --git a/Common/OpenGrid.Framework.Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
similarity index 97%
rename from Common/OpenGrid.Framework.Data/InventoryData.cs
rename to OpenSim/Framework/Data/InventoryData.cs
index 12f559bbf1..8a3a664ff0 100644
--- a/Common/OpenGrid.Framework.Data/InventoryData.cs
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
{
///
/// Inventory Item - contains all the properties associated with an individual inventory piece.
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
similarity index 89%
rename from Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
rename to OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index 048722ab26..dcafbcdb84 100644
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {62CDF671-0000-0000-0000-000000000000}
+ {36B72A9B-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGrid.Framework.Data
+ OpenSim.Framework.Data
JScript
Grid
IE50
false
Library
- OpenGrid.Framework.Data
+ OpenSim.Framework.Data
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
similarity index 84%
rename from Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
rename to OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index 764e8715d3..aefb02b032 100644
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -26,15 +26,15 @@
-
+
-
-
-
+
+
+
diff --git a/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
similarity index 89%
rename from Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
rename to OpenSim/Framework/Data/Properties/AssemblyInfo.cs
index 14466732e1..7d749d5354 100644
--- a/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/Common/OpenGrid.Framework.Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs
similarity index 96%
rename from Common/OpenGrid.Framework.Data/ReservationData.cs
rename to OpenSim/Framework/Data/ReservationData.cs
index 89c6105f6a..f404ebd75f 100644
--- a/Common/OpenGrid.Framework.Data/ReservationData.cs
+++ b/OpenSim/Framework/Data/ReservationData.cs
@@ -31,7 +31,7 @@ using System.Text;
using libsecondlife;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
{
public class ReservationData
{
diff --git a/Common/OpenGrid.Framework.Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
similarity index 96%
rename from Common/OpenGrid.Framework.Data/SimProfileData.cs
rename to OpenSim/Framework/Data/SimProfileData.cs
index a3e7cb7ce3..201aa01407 100644
--- a/Common/OpenGrid.Framework.Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
{
///
/// A class which contains information known to the grid server about a region
diff --git a/Common/OpenGrid.Framework.Data/UserData.cs b/OpenSim/Framework/Data/UserData.cs
similarity index 97%
rename from Common/OpenGrid.Framework.Data/UserData.cs
rename to OpenSim/Framework/Data/UserData.cs
index c2d5a7201f..2e15b4719a 100644
--- a/Common/OpenGrid.Framework.Data/UserData.cs
+++ b/OpenSim/Framework/Data/UserData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
{
///
/// An interface for connecting to user storage servers.
diff --git a/Common/OpenGrid.Framework.Data/UserProfileData.cs b/OpenSim/Framework/Data/UserProfileData.cs
similarity index 96%
rename from Common/OpenGrid.Framework.Data/UserProfileData.cs
rename to OpenSim/Framework/Data/UserProfileData.cs
index 82633e1344..00d422dd6f 100644
--- a/Common/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/OpenSim/Framework/Data/UserProfileData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
-namespace OpenGrid.Framework.Data
+namespace OpenSim.Framework.Data
{
///
/// Information about a particular user known to the userserver
diff --git a/Common/OpenSim.Framework/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
similarity index 100%
rename from Common/OpenSim.Framework/AgentInventory.cs
rename to OpenSim/Framework/General/AgentInventory.cs
diff --git a/Common/OpenSim.Framework/AuthenticateSessionBase.cs b/OpenSim/Framework/General/AuthenticateSessionBase.cs
similarity index 100%
rename from Common/OpenSim.Framework/AuthenticateSessionBase.cs
rename to OpenSim/Framework/General/AuthenticateSessionBase.cs
diff --git a/Common/OpenSim.Framework/BlockingQueue.cs b/OpenSim/Framework/General/BlockingQueue.cs
similarity index 100%
rename from Common/OpenSim.Framework/BlockingQueue.cs
rename to OpenSim/Framework/General/BlockingQueue.cs
diff --git a/Common/OpenSim.Framework/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs
similarity index 100%
rename from Common/OpenSim.Framework/IRegionCommsListener.cs
rename to OpenSim/Framework/General/IRegionCommsListener.cs
diff --git a/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
similarity index 100%
rename from Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs
rename to OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
similarity index 100%
rename from Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs
rename to OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
similarity index 100%
rename from Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs
rename to OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
similarity index 100%
rename from Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs
rename to OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
similarity index 100%
rename from Common/OpenSim.Framework/Interfaces/IAssetServer.cs
rename to OpenSim/Framework/General/Interfaces/IAssetServer.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
similarity index 96%
rename from Common/OpenSim.Framework/Interfaces/IClientAPI.cs
rename to OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 009648c87b..4e8ac1a0dc 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -69,6 +69,8 @@ namespace OpenSim.Framework.Interfaces
public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);
+ public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);
+
public interface IClientAPI
{
event ChatFromViewer OnChatFromViewer;
@@ -103,6 +105,8 @@ namespace OpenSim.Framework.Interfaces
event NewAvatar OnNewAvatar;
event GenericCall6 OnRemoveAvatar;
+ event UUIDNameRequest OnNameFromUUIDRequest;
+
event ParcelPropertiesRequest OnParcelPropertiesRequest;
event ParcelDivideRequest OnParcelDivideRequest;
event ParcelJoinRequest OnParcelJoinRequest;
diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
similarity index 100%
rename from Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
rename to OpenSim/Framework/General/Interfaces/ILocalStorage.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IUserServer.cs b/OpenSim/Framework/General/Interfaces/IUserServer.cs
similarity index 100%
rename from Common/OpenSim.Framework/Interfaces/IUserServer.cs
rename to OpenSim/Framework/General/Interfaces/IUserServer.cs
diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/OpenSim/Framework/General/Interfaces/IWorld.cs
similarity index 100%
rename from Common/OpenSim.Framework/Interfaces/IWorld.cs
rename to OpenSim/Framework/General/Interfaces/IWorld.cs
diff --git a/Common/OpenSim.Framework/Logger.cs b/OpenSim/Framework/General/Logger.cs
similarity index 100%
rename from Common/OpenSim.Framework/Logger.cs
rename to OpenSim/Framework/General/Logger.cs
diff --git a/Common/OpenSim.Framework/LoginService.cs b/OpenSim/Framework/General/LoginService.cs
similarity index 100%
rename from Common/OpenSim.Framework/LoginService.cs
rename to OpenSim/Framework/General/LoginService.cs
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
similarity index 79%
rename from Common/OpenSim.Framework/OpenSim.Framework.csproj
rename to OpenSim/Framework/General/OpenSim.Framework.csproj
index 7ebe0ee88d..48db634cd2 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
-
+
Local
8.0.50727
@@ -6,8 +6,7 @@
{8ACA2445-0000-0000-0000-000000000000}
Debug
AnyCPU
-
-
+
OpenSim.Framework
@@ -16,11 +15,9 @@
IE50
false
Library
-
-
+
OpenSim.Framework
-
-
+
@@ -31,18 +28,16 @@
TRACE;DEBUG
-
-
+
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
4
-
-
+
False
@@ -51,49 +46,45 @@
TRACE
-
-
+
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
4
-
-
+
-
- ..\..\bin\Db4objects.Db4o.dll
+
+ ..\..\..\bin\Db4objects.Db4o.dll
False
-
- ..\..\bin\libsecondlife.dll
+
+ ..\..\..\bin\libsecondlife.dll
False
-
+
System.dll
False
-
+
System.Xml.dll
False
+
+ ..\..\..\bin\XMLRPC.dll
+ False
+
-
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- XMLRPC
- {8E81D43C-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
@@ -109,9 +100,6 @@
Code
-
- Code
-
Code
@@ -160,12 +148,6 @@
Code
-
- Code
-
-
- Code
-
Code
@@ -219,4 +201,4 @@
-
\ No newline at end of file
+
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
similarity index 82%
rename from Common/OpenSim.Framework/OpenSim.Framework.dll.build
rename to OpenSim/Framework/General/OpenSim.Framework.dll.build
index afe1aeaaab..a18838bace 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -15,15 +15,12 @@
-
-
-
@@ -34,8 +31,6 @@
-
-
@@ -57,17 +52,17 @@
-
-
-
+
+
+
-
+
-
-
-
+
+
+
diff --git a/Common/OpenSim.Framework/Properties/AssemblyInfo.cs b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
similarity index 100%
rename from Common/OpenSim.Framework/Properties/AssemblyInfo.cs
rename to OpenSim/Framework/General/Properties/AssemblyInfo.cs
diff --git a/Common/OpenSim.Framework/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
similarity index 97%
rename from Common/OpenSim.Framework/RegionCommsListener.cs
rename to OpenSim/Framework/General/RegionCommsListener.cs
index bba928ff8b..5fa2f58956 100644
--- a/Common/OpenSim.Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework
{
if(OnExpectUser != null)
{
+
OnExpectUser(regionHandle, agent);
return true;
}
diff --git a/Common/OpenSim.Framework/Remoting.cs b/OpenSim/Framework/General/Remoting.cs
similarity index 100%
rename from Common/OpenSim.Framework/Remoting.cs
rename to OpenSim/Framework/General/Remoting.cs
diff --git a/Common/OpenSim.Framework/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs
similarity index 100%
rename from Common/OpenSim.Framework/SimProfile.cs
rename to OpenSim/Framework/General/SimProfile.cs
diff --git a/Common/OpenSim.Framework/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/AgentCiruitData.cs
rename to OpenSim/Framework/General/Types/AgentCiruitData.cs
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/AgentWearable.cs
rename to OpenSim/Framework/General/Types/AgentWearable.cs
diff --git a/Common/OpenSim.Framework/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/AssetBase.cs
rename to OpenSim/Framework/General/Types/AssetBase.cs
diff --git a/Common/OpenSim.Framework/Types/AssetLandmark.cs b/OpenSim/Framework/General/Types/AssetLandmark.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/AssetLandmark.cs
rename to OpenSim/Framework/General/Types/AssetLandmark.cs
diff --git a/Common/OpenSim.Framework/Types/AssetStorage.cs b/OpenSim/Framework/General/Types/AssetStorage.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/AssetStorage.cs
rename to OpenSim/Framework/General/Types/AssetStorage.cs
diff --git a/Common/OpenSim.Framework/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/EstateSettings.cs
rename to OpenSim/Framework/General/Types/EstateSettings.cs
diff --git a/Common/OpenSim.Framework/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/Login.cs
rename to OpenSim/Framework/General/Types/Login.cs
diff --git a/Common/OpenSim.Framework/Types/MapBlockData.cs b/OpenSim/Framework/General/Types/MapBlockData.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/MapBlockData.cs
rename to OpenSim/Framework/General/Types/MapBlockData.cs
diff --git a/Common/OpenSim.Framework/Types/NeighbourInfo.cs b/OpenSim/Framework/General/Types/NeighbourInfo.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/NeighbourInfo.cs
rename to OpenSim/Framework/General/Types/NeighbourInfo.cs
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
similarity index 80%
rename from Common/OpenSim.Framework/Types/NetworkServersInfo.cs
rename to OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 73d781169d..c6b81a7945 100644
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types
this.GridRecvKey = attri;
}
+ //Grid Server
+ attri = "";
+ attri = configData.GetAttribute("UserServerURL");
+ if (attri == "")
+ {
+ this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
+ configData.SetAttribute("UserServerURL", this.UserURL);
+ }
+ else
+ {
+ this.UserURL = attri;
+ }
+
+ //Grid Send Key
+ attri = "";
+ attri = configData.GetAttribute("UserSendKey");
+ if (attri == "")
+ {
+ this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null");
+ configData.SetAttribute("UserSendKey", this.UserSendKey);
+ }
+ else
+ {
+ this.UserSendKey = attri;
+ }
+
+ //Grid Receive Key
+ attri = "";
+ attri = configData.GetAttribute("UserRecvKey");
+ if (attri == "")
+ {
+ this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
+ configData.SetAttribute("GridRecvKey", this.UserRecvKey);
+ }
+ else
+ {
+ this.UserRecvKey = attri;
+ }
+
attri = "";
attri = configData.GetAttribute("AssetServerURL");
if (attri == "")
diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/ParcelData.cs
rename to OpenSim/Framework/General/Types/ParcelData.cs
diff --git a/Common/OpenSim.Framework/Types/PrimData.cs b/OpenSim/Framework/General/Types/PrimData.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/PrimData.cs
rename to OpenSim/Framework/General/Types/PrimData.cs
diff --git a/Common/OpenSim.Framework/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs
similarity index 100%
rename from Common/OpenSim.Framework/Types/RegionHandle.cs
rename to OpenSim/Framework/General/Types/RegionHandle.cs
diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
similarity index 96%
rename from Common/OpenSim.Framework/Types/RegionInfo.cs
rename to OpenSim/Framework/General/Types/RegionInfo.cs
index 48e692278c..0fba6caa15 100644
--- a/Common/OpenSim.Framework/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimLocationX");
if (attri == "")
{
- string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");
+ string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");
configData.SetAttribute("SimLocationX", location);
this.RegionLocX = (uint)Convert.ToUInt32(location);
}
@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimLocationY");
if (attri == "")
{
- string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");
+ string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
configData.SetAttribute("SimLocationY", location);
this.RegionLocY = (uint)Convert.ToUInt32(location);
}
diff --git a/Common/OpenSim.Framework/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs
similarity index 95%
rename from Common/OpenSim.Framework/UserProfile.cs
rename to OpenSim/Framework/General/UserProfile.cs
index 04ff20b591..263dba2504 100644
--- a/Common/OpenSim.Framework/UserProfile.cs
+++ b/OpenSim/Framework/General/UserProfile.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.User
{
Circuits = new Dictionary();
Inventory = new AgentInventory();
- homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
+ homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256));
homepos = new LLVector3();
homelookat = new LLVector3();
}
diff --git a/Common/OpenSim.Framework/Util.cs b/OpenSim/Framework/General/Util.cs
similarity index 100%
rename from Common/OpenSim.Framework/Util.cs
rename to OpenSim/Framework/General/Util.cs
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj
similarity index 87%
rename from Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
rename to OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj
index df68722997..aae8cd2419 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
+++ b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {E88EF749-0000-0000-0000-000000000000}
+ {C74E4A30-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.GenericConfig.Xml
+ OpenSim.Framework.GenericConfig.Xml
JScript
Grid
IE50
false
Library
- OpenSim.GenericConfig.Xml
+ OpenSim.Framework.GenericConfig.Xml
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -68,7 +68,7 @@
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
diff --git a/OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build
similarity index 77%
rename from OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build
rename to OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build
index 771754592a..a4617cc3d6 100644
--- a/OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build
+++ b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,10 +8,10 @@
-
+
-
+
@@ -19,15 +19,14 @@
-
-
+
-
-
-
+
+
+
diff --git a/Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs b/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
similarity index 100%
rename from Common/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
rename to OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
diff --git a/Common/OpenSim.GenericConfig/Xml/XmlConfig.cs b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
similarity index 100%
rename from Common/OpenSim.GenericConfig/Xml/XmlConfig.cs
rename to OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
similarity index 95%
rename from Common/OpenSim.Servers/BaseHttpServer.cs
rename to OpenSim/Framework/Servers/BaseHttpServer.cs
index e55e33c2f5..8c8204a760 100644
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -31,12 +31,11 @@ using System.Net;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
-//using OpenSim.CAPS;
using Nwc.XmlRpc;
using System.Collections;
using OpenSim.Framework.Console;
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
{
public class BaseHttpServer
{
@@ -171,7 +170,7 @@ namespace OpenSim.Servers
protected virtual string ParseLLSDXML(string requestBody)
{
// dummy function for now - IMPLEMENT ME!
- Console.WriteLine("LLSD request "+requestBody);
+ //Console.WriteLine("LLSD request "+requestBody);
string resp = "";
if (firstcaps)
{
@@ -195,7 +194,7 @@ namespace OpenSim.Servers
}
catch (Exception e)
{
- Console.WriteLine(e.ToString());
+ //Console.WriteLine(e.ToString());
}
return responseString;
}
@@ -273,7 +272,7 @@ namespace OpenSim.Servers
}
catch (Exception e)
{
- Console.WriteLine(e.ToString());
+ //Console.WriteLine(e.ToString());
}
}
diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
similarity index 97%
rename from Common/OpenSim.Servers/CheckSumServer.cs
rename to OpenSim/Framework/Servers/CheckSumServer.cs
index a3592055d0..6aeb58c628 100644
--- a/Common/OpenSim.Servers/CheckSumServer.cs
+++ b/OpenSim/Framework/Servers/CheckSumServer.cs
@@ -40,7 +40,7 @@ using libsecondlife.Packets;
using OpenSim.Framework.Console;
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
{
/* public class CheckSumServer : UDPServerBase
{
diff --git a/Common/OpenSim.Servers/IRestHandler.cs b/OpenSim/Framework/Servers/IRestHandler.cs
similarity index 96%
rename from Common/OpenSim.Servers/IRestHandler.cs
rename to OpenSim/Framework/Servers/IRestHandler.cs
index 3aa508c4ed..a2b6bf09d6 100644
--- a/Common/OpenSim.Servers/IRestHandler.cs
+++ b/OpenSim/Framework/Servers/IRestHandler.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
{
public delegate string RestMethod( string request, string path, string param );
}
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
new file mode 100644
index 0000000000..399f45634c
--- /dev/null
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -0,0 +1,116 @@
+
+
+ Local
+ 8.0.50727
+ 2.0
+ {2CC71860-0000-0000-0000-000000000000}
+ Debug
+ AnyCPU
+
+
+
+ OpenSim.Framework.Servers
+ JScript
+ Grid
+ IE50
+ false
+ Library
+
+ OpenSim.Framework.Servers
+
+
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE
+
+ False
+ 4096
+ True
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+
+ ..\..\..\bin\libsecondlife.dll
+ False
+
+
+ System.dll
+ False
+
+
+ System.Xml.dll
+ False
+
+
+ ..\..\..\bin\XMLRPC.dll
+ False
+
+
+
+
+ OpenSim.Framework
+ {8ACA2445-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Console
+ {A7CD0630-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
similarity index 82%
rename from OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
rename to OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
index 7c3eb683b1..7401b07d73 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,11 +8,14 @@
-
+
-
-
+
+
+
+
+
diff --git a/Common/OpenSim.Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs
similarity index 96%
rename from Common/OpenSim.Servers/UDPServerBase.cs
rename to OpenSim/Framework/Servers/UDPServerBase.cs
index b472c978bd..610d23b029 100644
--- a/Common/OpenSim.Servers/UDPServerBase.cs
+++ b/OpenSim/Framework/Servers/UDPServerBase.cs
@@ -38,7 +38,7 @@ using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
{
public class UDPServerBase
{
diff --git a/Common/OpenSim.Servers/XmlRpcMethod.cs b/OpenSim/Framework/Servers/XmlRpcMethod.cs
similarity index 96%
rename from Common/OpenSim.Servers/XmlRpcMethod.cs
rename to OpenSim/Framework/Servers/XmlRpcMethod.cs
index 05cbf2ef39..51b3303f95 100644
--- a/Common/OpenSim.Servers/XmlRpcMethod.cs
+++ b/OpenSim/Framework/Servers/XmlRpcMethod.cs
@@ -28,7 +28,7 @@
using System;
using Nwc.XmlRpc;
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
{
public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request );
}
diff --git a/Common/OpenGrid.Framework.UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
similarity index 93%
rename from Common/OpenGrid.Framework.UserManager/LoginResponse.cs
rename to OpenSim/Framework/UserManager/LoginResponse.cs
index 514ebef970..d1cd8cf576 100644
--- a/Common/OpenGrid.Framework.UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -9,7 +9,7 @@ using OpenSim.Framework.Utilities;
using OpenSim.Framework.Interfaces;
using Nwc.XmlRpc;
-namespace OpenGrid.Framework.UserManagement
+namespace OpenSim.Framework.UserManagement
{
///
@@ -124,7 +124,7 @@ namespace OpenGrid.Framework.UserManagement
this.ErrorReason = "key";
this.welcomeMessage = "Welcome to OpenSim!";
this.seedCapability = "";
- this.home = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
+ this.home = "{'region_handle':[r" + (1000 * 256).ToString() + ",r" + (1000 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
this.RegionX = (uint)255232;
this.RegionY = (uint)254976;
@@ -227,6 +227,7 @@ namespace OpenGrid.Framework.UserManagement
responseData["sim_port"] =(Int32) this.SimPort;
responseData["sim_ip"] = this.SimAddress;
+ Console.MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
responseData["agent_id"] = this.AgentID.ToStringHyphenated();
responseData["session_id"] = this.SessionID.ToStringHyphenated();
responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
similarity index 79%
rename from Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj
rename to OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
index 9a3cdbaf40..02aa3f3686 100644
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {DA9A7391-0000-0000-0000-000000000000}
+ {586E2916-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGrid.Framework.UserManagement
+ OpenSim.Framework.UserManagement
JScript
Grid
IE50
false
Library
- OpenGrid.Framework.UserManagement
+ OpenSim.Framework.UserManagement
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,11 +59,11 @@
- ..\..\bin\Db4objects.Db4o.dll
+ ..\..\..\bin\Db4objects.Db4o.dll
False
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -74,12 +74,12 @@
OpenSim.Framework.Console.dll
False
-
- OpenSim.GenericConfig.Xml.dll
+
+ OpenSim.Framework.GenericConfig.Xml.dll
False
-
- OpenSim.Servers.dll
+
+ OpenSim.Framework.Servers.dll
False
@@ -94,15 +94,15 @@
System.Xml.dll
False
-
- XMLRPC.dll
+
+ ..\..\..\bin\XMLRPC.dll
False
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
new file mode 100644
index 0000000000..d2f4345889
--- /dev/null
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
similarity index 83%
rename from Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
rename to OpenSim/Framework/UserManager/UserManagerBase.cs
index 01fbf3ab8c..d06059e927 100644
--- a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
using libsecondlife;
using System.Reflection;
@@ -41,7 +41,7 @@ using OpenSim.Framework.Utilities;
using System.Security.Cryptography;
-namespace OpenGrid.Framework.UserManagement
+namespace OpenSim.Framework.UserManagement
{
public class UserManagerBase
{
@@ -468,17 +468,16 @@ namespace OpenGrid.Framework.UserManagement
}
catch (Exception e)
{
- Console.WriteLine(e.ToString());
+ System.Console.WriteLine(e.ToString());
return logResponse.CreateDeadRegionResponse();
}
CommitAgent(ref TheUser);
-
return logResponse.ToXmlRpcResponse();
}
catch (Exception E)
{
- Console.WriteLine(E.ToString());
+ System.Console.WriteLine(E.ToString());
}
//}
}
@@ -537,27 +536,15 @@ namespace OpenGrid.Framework.UserManagement
/// Returns an error message that the user could not be found in the database
///
/// XML string consisting of a error element containing individual error(s)
- public string CreateUnknownUserErrorResponse()
+ public XmlRpcResponse CreateUnknownUserErrorResponse()
{
- System.IO.StringWriter sw = new System.IO.StringWriter();
- XmlTextWriter xw = new XmlTextWriter(sw);
+ XmlRpcResponse response = new XmlRpcResponse();
+ Hashtable responseData = new Hashtable();
+ responseData["error_type"] = "unknown_user";
+ responseData["error_desc"] = "The user requested is not in the database";
- // Header
- xw.Formatting = Formatting.Indented;
- xw.WriteStartDocument();
- xw.WriteDocType("error", null, null, null);
- xw.WriteComment("An error occured");
- xw.WriteStartElement("error");
-
- // User
- xw.WriteElementString("unknownuser", "Unable to find a user with that name");
-
- // Footer
- xw.WriteEndElement();
- xw.Flush();
- xw.Close();
-
- return sw.ToString();
+ response.Value = responseData;
+ return response;
}
///
@@ -565,75 +552,81 @@ namespace OpenGrid.Framework.UserManagement
///
/// The user profile
/// A string containing an XML Document of the user profile
- public string ProfileToXml(UserProfileData profile)
+ public XmlRpcResponse ProfileToXmlRPCResponse(UserProfileData profile)
{
- System.IO.StringWriter sw = new System.IO.StringWriter();
- XmlTextWriter xw = new XmlTextWriter(sw);
+ XmlRpcResponse response = new XmlRpcResponse();
+ Hashtable responseData = new Hashtable();
- // Header
- xw.Formatting = Formatting.Indented;
- xw.WriteStartDocument();
- xw.WriteDocType("userprofile", null, null, null);
- xw.WriteComment("Found user profiles matching the request");
- xw.WriteStartElement("users");
-
- // User
- xw.WriteStartElement("user");
// Account information
- xw.WriteAttributeString("firstname", profile.username);
- xw.WriteAttributeString("lastname", profile.surname);
- xw.WriteAttributeString("uuid", profile.UUID.ToStringHyphenated());
+ responseData["firstname"] = profile.username;
+ responseData["lastname"] = profile.surname;
+ responseData["uuid"] = profile.UUID.ToStringHyphenated();
// Server Information
- xw.WriteAttributeString("server_inventory", profile.userInventoryURI);
- xw.WriteAttributeString("server_asset", profile.userAssetURI);
+ responseData["server_inventory"] = profile.userInventoryURI;
+ responseData["server_asset"] = profile.userAssetURI;
// Profile Information
- xw.WriteAttributeString("profile_about", profile.profileAboutText);
- xw.WriteAttributeString("profile_firstlife_about", profile.profileFirstText);
- xw.WriteAttributeString("profile_firstlife_image", profile.profileFirstImage.ToStringHyphenated());
- xw.WriteAttributeString("profile_can_do", profile.profileCanDoMask.ToString());
- xw.WriteAttributeString("profile_want_do", profile.profileWantDoMask.ToString());
- xw.WriteAttributeString("profile_image", profile.profileImage.ToStringHyphenated());
- xw.WriteAttributeString("profile_created",profile.created.ToString());
- xw.WriteAttributeString("profile_lastlogin",profile.lastLogin.ToString());
+ responseData["profile_about"] = profile.profileAboutText;
+ responseData["profile_firstlife_about"] = profile.profileFirstText;
+ responseData["profile_firstlife_image"] = profile.profileFirstImage.ToStringHyphenated();
+ responseData["profile_can_do"] = profile.profileCanDoMask.ToString();
+ responseData["profile_want_do"] = profile.profileWantDoMask.ToString();
+ responseData["profile_image"] = profile.profileImage.ToStringHyphenated();
+ responseData["profile_created"] = profile.created.ToString();
+ responseData["profile_lastlogin"] = profile.lastLogin.ToString();
// Home region information
- xw.WriteAttributeString("home_coordinates", profile.homeLocation.ToString());
- xw.WriteAttributeString("home_region", profile.homeRegion.ToString());
- xw.WriteAttributeString("home_look", profile.homeLookAt.ToString());
+ responseData["home_coordinates"] = profile.homeLocation.ToString();
+ responseData["home_region"] = profile.homeRegion.ToString();
+ responseData["home_look"] = profile.homeLookAt.ToString();
- xw.WriteEndElement();
-
- // Footer
- xw.WriteEndElement();
- xw.Flush();
- xw.Close();
-
- return sw.ToString();
+ response.Value = responseData;
+ return response;
}
- #region REST Methods
+ #region XMLRPC User Methods
//should most likely move out of here and into the grid's userserver sub class
- public string RestGetUserMethodName(string request, string path, string param)
+ public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request)
{
- UserProfileData userProfile = getUserProfile(param.Trim());
+ XmlRpcResponse response = new XmlRpcResponse();
+ Hashtable requestData = (Hashtable)request.Params[0];
+ UserProfileData userProfile;
- if (userProfile == null)
+ if (requestData.Contains("avatar_name"))
+ {
+ userProfile = getUserProfile((string)requestData["avatar_name"]);
+ if (userProfile == null)
+ {
+ return CreateUnknownUserErrorResponse();
+ }
+ }
+ else
{
return CreateUnknownUserErrorResponse();
}
+
- return ProfileToXml(userProfile);
+ return ProfileToXmlRPCResponse(userProfile);
}
- public string RestGetUserMethodUUID(string request, string path, string param)
+ public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request)
{
- UserProfileData userProfile = getUserProfile(new LLUUID(param));
-
- if (userProfile == null)
+ XmlRpcResponse response = new XmlRpcResponse();
+ Hashtable requestData = (Hashtable)request.Params[0];
+ UserProfileData userProfile;
+ if (requestData.Contains("avatar_uuid"))
+ {
+ userProfile = getUserProfile((LLUUID)requestData["avatar_uuid"]);
+ if (userProfile == null)
+ {
+ return CreateUnknownUserErrorResponse();
+ }
+ }
+ else
{
return CreateUnknownUserErrorResponse();
}
- return ProfileToXml(userProfile);
+
+ return ProfileToXmlRPCResponse(userProfile);
}
#endregion
diff --git a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
similarity index 96%
rename from OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
rename to OpenSim/Grid/AssetServer/AssetHttpServer.cs
index 6fc6bf89c4..ad8733f9e4 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -35,9 +35,9 @@ using System.Threading;
using Nwc.XmlRpc;
using System.Collections;
using OpenSim.Framework.Console;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
-namespace OpenGridServices.AssetServer
+namespace OpenSim.Grid.AssetServer
{
///
/// An HTTP server for sending assets
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
similarity index 96%
rename from OpenGridServices/OpenGridServices.AssetServer/Main.cs
rename to OpenSim/Grid/AssetServer/Main.cs
index 96c9dbafbf..d06998d63f 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -40,11 +40,11 @@ using OpenSim.Framework.Console;
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
using Db4objects.Db4o;
using Db4objects.Db4o.Query;
-namespace OpenGridServices.AssetServer
+namespace OpenSim.Grid.AssetServer
{
///
/// An asset server
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
similarity index 84%
rename from OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
rename to OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index 7470499340..caebca32ea 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {0021261B-0000-0000-0000-000000000000}
+ {E5F1A03B-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGridServices.AssetServer
+ OpenSim.Grid.AssetServer
JScript
Grid
IE50
false
Exe
- OpenGridServices.AssetServer
+ OpenSim.Grid.AssetServer
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,11 +59,11 @@
- ..\..\bin\Db4objects.Db4o.dll
+ ..\..\..\bin\Db4objects.Db4o.dll
False
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -74,8 +74,8 @@
OpenSim.Framework.Console.dll
False
-
- OpenSim.Servers.dll
+
+ OpenSim.Framework.Servers.dll
False
@@ -90,8 +90,8 @@
System.Xml.dll
False
-
- XMLRPC.dll
+
+ ..\..\..\bin\XMLRPC.dll
False
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
similarity index 71%
rename from OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
rename to OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
index 385d85def5..0f9540e842 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -20,20 +20,20 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
+
+
+
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
rename to OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
similarity index 94%
rename from OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs
rename to OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
index dfc572ab7f..3f5d7ddbee 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridManagementAgent.cs
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -27,12 +27,12 @@
*/
using Nwc.XmlRpc;
using OpenSim.Framework;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
using System.Collections;
using System.Collections.Generic;
using libsecondlife;
-namespace OpenGrid.Framework.Manager
+namespace OpenSim.Framework.Manager
{
///
/// Used to pass messages to the gridserver
@@ -116,7 +116,7 @@ namespace OpenGrid.Framework.Manager
Hashtable requestData = (Hashtable)request.Params[0];
Hashtable responseData = new Hashtable();
- // TODO: Switch this over to using OpenGrid.Framework.Data
+ // TODO: Switch this over to using OpenSim.Framework.Data
if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
{
response.IsFault = false;
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
similarity index 96%
rename from OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
rename to OpenSim/Grid/Framework.Manager/GridServerManager.cs
index e276556f78..d5eaf6f440 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -33,7 +33,7 @@ using Nwc.XmlRpc;
using System.Threading;
using libsecondlife;
-namespace OpenGrid.Framework.Manager {
+namespace OpenSim.Framework.Manager {
///
/// A remote management system for the grid server
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
similarity index 83%
rename from OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
rename to OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
index e1c9f422f7..9a98ff4177 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {7924FD35-0000-0000-0000-000000000000}
+ {4B7BFD1C-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGrid.Framework.Manager
+ OpenSim.Grid.Framework.Manager
JScript
Grid
IE50
false
Library
- OpenGrid.Framework.Manager
+ OpenSim.Grid.Framework.Manager
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,23 +59,23 @@
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
OpenSim.Framework.dll
False
-
- OpenSim.Servers.dll
+
+ OpenSim.Framework.Servers.dll
False
System.dll
False
-
- XMLRPC.dll
+
+ ..\..\..\bin\XMLRPC.dll
False
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
new file mode 100644
index 0000000000..119967d6ff
--- /dev/null
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs b/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
rename to OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
similarity index 100%
rename from OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
rename to OpenSim/Grid/GridServer.Config/DbGridConfig.cs
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj
similarity index 92%
rename from OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
rename to OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj
index ddb48af8d0..24e845c0ac 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
+++ b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {B0027747-0000-0000-0000-000000000000}
+ {1442B635-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGrid.Config.GridConfigDb4o
+ OpenSim.Grid.GridServer.Config
JScript
Grid
IE50
false
Library
- OpenGrid.Config.GridConfigDb4o
+ OpenSim.Grid.GridServer.Config
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
similarity index 86%
rename from OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
rename to OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
index 075593ba3e..ff57dacfb2 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
+++ b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
similarity index 97%
rename from OpenGridServices/OpenGridServices.GridServer/GridManager.cs
rename to OpenSim/Grid/GridServer/GridManager.cs
index bf80652630..c78d14a6fa 100644
--- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -30,7 +30,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Text;
using System.Reflection;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Console;
using OpenSim.Framework.Sims;
@@ -38,7 +38,7 @@ using libsecondlife;
using Nwc.XmlRpc;
using System.Xml;
-namespace OpenGridServices.GridServer
+namespace OpenSim.Grid.GridServer
{
class GridManager
{
diff --git a/OpenGridServices/OpenGridServices.GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
similarity index 94%
rename from OpenGridServices/OpenGridServices.GridServer/Main.cs
rename to OpenSim/Grid/GridServer/Main.cs
index b948fd63e4..b225214e42 100644
--- a/OpenGridServices/OpenGridServices.GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -34,22 +34,22 @@ using System.Net;
using System.Threading;
using System.Reflection;
using libsecondlife;
-using OpenGrid.Framework.Manager;
+using OpenSim.Framework.Manager;
using OpenSim.Framework;
using OpenSim.Framework.Sims;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
using OpenSim.GenericConfig;
-namespace OpenGridServices.GridServer
+namespace OpenSim.Grid.GridServer
{
///
///
public class OpenGrid_Main : conscmd_callback
{
private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
- private string GridDll = "OpenGrid.Framework.Data.MySQL.dll";
+ private string GridDll = "OpenSim.Framework.Data.MySQL.dll";
public GridConfig Cfg;
public static OpenGrid_Main thegrid;
@@ -253,8 +253,8 @@ namespace OpenGridServices.GridServer
attri = configData.GetAttribute("DataBaseProvider");
if (attri == "")
{
- GridDll = "OpenGrid.Framework.Data.DB4o.dll";
- configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
+ GridDll = "OpenSim.Framework.Data.DB4o.dll";
+ configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
}
else
{
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
similarity index 76%
rename from OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
rename to OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
index 291f997014..424072e34f 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {21BFC8E2-0000-0000-0000-000000000000}
+ {60FCC3A6-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGridServices.GridServer
+ OpenSim.Grid.GridServer
JScript
Grid
IE50
false
Exe
- OpenGridServices.GridServer
+ OpenSim.Grid.GridServer
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,11 +59,11 @@
- ..\..\bin\Db4objects.Db4o.dll
+ ..\..\..\bin\Db4objects.Db4o.dll
False
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -74,12 +74,12 @@
OpenSim.Framework.Console.dll
False
-
- OpenSim.GenericConfig.Xml.dll
+
+ OpenSim.Framework.GenericConfig.Xml.dll
False
-
- OpenSim.Servers.dll
+
+ OpenSim.Framework.Servers.dll
False
@@ -94,21 +94,21 @@
System.Xml.dll
False
-
- XMLRPC.dll
+
+ ..\..\..\bin\XMLRPC.dll
False
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenGrid.Framework.Manager
- {7924FD35-0000-0000-0000-000000000000}
+
+ OpenSim.Grid.Framework.Manager
+ {4B7BFD1C-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
similarity index 66%
rename from OpenSim/Examples/SimpleApp/SimpleApp.exe.build
rename to OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
index 087922bbf4..3573e8926d 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
@@ -1,5 +1,5 @@
-
+
@@ -8,11 +8,11 @@
-
+
-
-
+
+
@@ -20,18 +20,16 @@
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
rename to OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.InventoryServer/InventoryManager.cs
rename to OpenSim/Grid/InventoryServer/InventoryManager.cs
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.InventoryServer/Main.cs
rename to OpenSim/Grid/InventoryServer/Main.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.mds b/OpenSim/Grid/Manager/OpenGridServices.Manager.mds
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.mds
rename to OpenSim/Grid/Manager/OpenGridServices.Manager.mds
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.userprefs b/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.usertasks b/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
rename to OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Connect to grid server.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/Connect to grid server.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb b/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
diff --git a/OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
similarity index 100%
rename from OpenGridServices/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
rename to OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs b/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
rename to OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
similarity index 100%
rename from OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
rename to OpenSim/Grid/UserServer.Config/DbUserConfig.cs
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj
similarity index 92%
rename from OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
rename to OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj
index a89a38de09..1ae958914d 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
+++ b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {7E494328-0000-0000-0000-000000000000}
+ {08F87229-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenUser.Config.UserConfigDb4o
+ OpenSim.Grid.UserServer.Config
JScript
Grid
IE50
false
Library
- OpenUser.Config.UserConfigDb4o
+ OpenSim.Grid.UserServer.Config
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
similarity index 86%
rename from OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
rename to OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
index bd5d49fb8d..fc7e00bcf4 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
similarity index 90%
rename from OpenGridServices/OpenGridServices.UserServer/Main.cs
rename to OpenSim/Grid/UserServer/Main.cs
index 5c27d57eb2..640f91a57a 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -38,18 +38,18 @@ using OpenSim.Framework.Sims;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Console;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
using OpenSim.Framework.Utilities;
using OpenSim.GenericConfig;
-namespace OpenGridServices.UserServer
+namespace OpenSim.Grid.UserServer
{
///
///
public class OpenUser_Main : conscmd_callback
{
- private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";
- private string StorageDll = "OpenGrid.Framework.Data.MySQL.dll";
+ private string ConfigDll = "OpenSim.Grid.UserServer.Config.dll";
+ private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
private UserConfig Cfg;
protected IGenericConfig localXMLConfig;
@@ -107,8 +107,8 @@ namespace OpenGridServices.UserServer
httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
- httpServer.AddRestHandler("GET", "/user/name/", m_userManager.RestGetUserMethodName);
- httpServer.AddRestHandler("GET", "/user/uuid/", m_userManager.RestGetUserMethodUUID);
+ httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName);
+ httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID);
httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod);
@@ -169,8 +169,8 @@ namespace OpenGridServices.UserServer
attri = configData.GetAttribute("DataBaseProvider");
if (attri == "")
{
- StorageDll = "OpenGrid.Framework.Data.DB4o.dll";
- configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
+ StorageDll = "OpenSim.Framework.Data.DB4o.dll";
+ configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
}
else
{
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
similarity index 74%
rename from OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
rename to OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index ad0080ad6c..1146b1714a 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {66591469-0000-0000-0000-000000000000}
+ {2FC96F92-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGridServices.UserServer
+ OpenSim.Grid.UserServer
JScript
Grid
IE50
false
Exe
- OpenGridServices.UserServer
+ OpenSim.Grid.UserServer
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,15 +59,11 @@
- ..\..\bin\Db4objects.Db4o.dll
+ ..\..\..\bin\Db4objects.Db4o.dll
False
- ..\..\bin\libsecondlife.dll
- False
-
-
- OpenGrid.Framework.UserManager.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -78,12 +74,12 @@
OpenSim.Framework.Console.dll
False
-
- OpenSim.GenericConfig.Xml.dll
+
+ OpenSim.Framework.GenericConfig.Xml.dll
False
-
- OpenSim.Servers.dll
+
+ OpenSim.Framework.Servers.dll
False
@@ -98,15 +94,21 @@
System.Xml.dll
False
-
- XMLRPC.dll
+
+ ..\..\..\bin\XMLRPC.dll
False
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.UserManagement
+ {586E2916-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
similarity index 66%
rename from OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
rename to OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
index d2629474a1..8bc1fc168a 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -20,23 +20,23 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
diff --git a/OpenGridServices/OpenGridServices.UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenGridServices/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
rename to OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
similarity index 95%
rename from OpenGridServices/OpenGridServices.UserServer/UserManager.cs
rename to OpenSim/Grid/UserServer/UserManager.cs
index 0704de1d53..c99cf87ced 100644
--- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
using libsecondlife;
using System.Reflection;
@@ -38,11 +38,12 @@ using Nwc.XmlRpc;
using OpenSim.Framework.Sims;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
-using OpenGrid.Framework.UserManagement;
+
+using OpenSim.Framework.UserManagement;
using System.Security.Cryptography;
-namespace OpenGridServices.UserServer
+namespace OpenSim.Grid.UserServer
{
public class UserManager : UserManagerBase
{
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs b/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
deleted file mode 100644
index 7b53388be4..0000000000
--- a/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* 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
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Reflection;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using libsecondlife;
-
-namespace OpenSim.Region.Scenes
-{
- public partial class Scene
- {
- private Dictionary scriptEngines = new Dictionary();
-
- ///
- ///
- ///
- private void LoadScriptEngines()
- {
- this.LoadScriptPlugins();
- }
-
- ///
- ///
- ///
- public void LoadScriptPlugins()
- {
- string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "ScriptEngines");
- string[] pluginFiles = Directory.GetFiles(path, "*.dll");
-
-
- for (int i = 0; i < pluginFiles.Length; i++)
- {
- this.AddPlugin(pluginFiles[i]);
- }
- }
-
- ///
- ///
- ///
- ///
- private void AddPlugin(string FileName)
- {
- Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-
- foreach (Type pluginType in pluginAssembly.GetTypes())
- {
- if (pluginType.IsPublic)
- {
- if (!pluginType.IsAbstract)
- {
- Type typeInterface = pluginType.GetInterface("IScriptEngine", true);
-
- if (typeInterface != null)
- {
- IScriptEngine plug = (IScriptEngine)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
- plug.Init(this);
- this.scriptEngines.Add(plug.GetName(), plug);
-
- }
-
- typeInterface = null;
- }
- }
- }
-
- pluginAssembly = null;
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void LoadScript(string scriptType, string scriptName, string script, Entity ent)
- {
- if(this.scriptEngines.ContainsKey(scriptType))
- {
- this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.LocalId);
- }
- }
-
- #region IScriptAPI Methods
-
- ///
- ///
- ///
- ///
- ///
- public LLVector3 GetEntityPosition(uint localID)
- {
- LLVector3 res = new LLVector3();
- // Console.WriteLine("script- getting entity " + localID + " position");
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity.LocalId == localID)
- {
- res.X = entity.Pos.X;
- res.Y = entity.Pos.Y;
- res.Z = entity.Pos.Z;
- }
- }
- return res;
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void SetEntityPosition(uint localID, float x , float y, float z)
- {
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity.LocalId == localID && entity is Primitive)
- {
- LLVector3 pos = entity.Pos;
- pos.X = x;
- pos.Y = y;
- Primitive prim = entity as Primitive;
- // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
- //prim.UpdatePosition(pos);
- // Console.WriteLine("script- setting entity " + localID + " positon");
- }
- }
-
- }
-
- ///
- ///
- ///
- ///
- public uint GetRandomAvatarID()
- {
- //Console.WriteLine("script- getting random avatar id");
- uint res = 0;
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity is ScenePresence)
- {
- res = entity.LocalId;
- }
- }
- return res;
- }
-
- #endregion
-
-
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JSharpScriptEngine.cs b/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JSharpScriptEngine.cs
deleted file mode 100644
index b33b55df42..0000000000
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JSharpScriptEngine.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* 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
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-// Compilation stuff
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using Microsoft.VJSharp;
-
-namespace OpenSim.Scripting
-{
- public class JSharpScriptEngine : IScriptCompiler
- {
- public string FileExt()
- {
- return ".jsl";
- }
-
- private Dictionary LoadDotNetScript(ICodeCompiler compiler, string filename)
- {
- CompilerParameters compilerParams = new CompilerParameters();
- CompilerResults compilerResults;
- compilerParams.GenerateExecutable = false;
- compilerParams.GenerateInMemory = true;
- compilerParams.IncludeDebugInformation = false;
- compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll");
- compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll");
- compilerParams.ReferencedAssemblies.Add("libsecondlife.dll");
- compilerParams.ReferencedAssemblies.Add("System.dll");
-
- compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
-
- if (compilerResults.Errors.Count > 0)
- {
- OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");
- foreach (CompilerError error in compilerResults.Errors)
- {
- OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
- }
- }
- else
- {
- Dictionary scripts = new Dictionary();
-
- foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())
- {
- Type testInterface = pluginType.GetInterface("IScript", true);
-
- if (testInterface != null)
- {
- IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());
-
- string scriptName = "J#/" + script.getName();
- Console.WriteLine("Script: " + scriptName + " loaded.");
-
- if (!scripts.ContainsKey(scriptName))
- {
- scripts.Add(scriptName, script);
- }
- else
- {
- scripts[scriptName] = script;
- }
- }
- }
- return scripts;
- }
- return null;
- }
-
- public Dictionary compile(string filename)
- {
- VJSharpCodeProvider jsharpProvider = new VJSharpCodeProvider();
- return LoadDotNetScript(jsharpProvider.CreateCompiler(), filename);
- }
- }
-}
diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build
deleted file mode 100644
index 13ca938693..0000000000
--- a/OpenSim/OpenSim/OpenSim.exe.build
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/Region/Application/Application.cs
similarity index 94%
rename from OpenSim/OpenSim/Application.cs
rename to OpenSim/Region/Application/Application.cs
index 40701b04a1..1dcd99bd28 100644
--- a/OpenSim/OpenSim/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -29,6 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework.Console;
+using OpenSim.Region.ClientStack;
namespace OpenSim
{
@@ -108,7 +109,7 @@ namespace OpenSim
sim.m_sandbox = sandBoxMode;
sim.user_accounts = userAccounts;
sim.gridLocalAsset = gridLocalAsset;
- OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
+ OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
sim.StartUp();
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
similarity index 61%
rename from OpenSim/OpenSim/OpenSim.csproj
rename to OpenSim/Region/Application/OpenSim.csproj
index 222e2f7098..bec85cca39 100644
--- a/OpenSim/OpenSim/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,15 +59,15 @@
- ..\..\bin\Axiom.MathLib.dll
+ ..\..\..\bin\Axiom.MathLib.dll
False
- ..\..\bin\Db4objects.Db4o.dll
+ ..\..\..\bin\Db4objects.Db4o.dll
False
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -78,89 +78,93 @@
System.Xml.dll
False
+
+ ..\..\..\bin\XMLRPC.dll
+ False
+
-
- OpenGrid.Framework.Communications
- {683344D5-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenGrid.Framework.Communications.OGS1
- {17442AF1-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenGrid.Framework.UserManagement
- {DA9A7391-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Caches
- {1938EB12-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
+ OpenSim.Framework.Communications
+ {CB52B7E7-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.GenericConfig.Xml
- {E88EF749-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.LocalCommunications
- {79CED992-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.GenericConfig.Xml
+ {C74E4A30-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Physics.Manager
- {8BE16150-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Servers
+ {2CC71860-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Region
- {196916AF-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.UserManagement
+ {586E2916-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.RegionServer
- {632E1BFD-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Caches
+ {61FCCDB3-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Servers
- {8BB20F0A-0000-0000-0000-000000000000}
+
+ OpenSim.Region.ClientStack
+ {DC3698B2-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Terrain.BasicTerrain
- {2270B8FE-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Communications.Local
+ {BFB5D807-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- XMLRPC
- {8E81D43C-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Communications.OGS1
+ {4806E378-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Environment
+ {DCBA491C-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Physics.Manager
+ {F4FF31EB-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Terrain.BasicTerrain
+ {C9E0F891-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
@@ -172,6 +176,9 @@
Code
+
+ Code
+
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
new file mode 100644
index 0000000000..6c7d7ac0ab
--- /dev/null
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
similarity index 86%
rename from OpenSim/OpenSim/OpenSimMain.cs
rename to OpenSim/Region/Application/OpenSimMain.cs
index b7ec9e6886..fcb2493366 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -38,30 +38,34 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Region;
-using OpenSim.Region.Scenes;
-using OpenSim.Terrain;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Terrain;
using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Data;
+
using OpenSim.Framework.Types;
using OpenSim.Framework;
using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
using OpenSim.Framework.Console;
using OpenSim.Physics.Manager;
using Nwc.XmlRpc;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
using OpenSim.GenericConfig;
-using OpenGrid.Framework.Communications;
-using OpenSim.LocalCommunications;
-using OpenGrid.Framework.Communications.OGS1;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Communications.OGS1;
+using OpenSim.Region.Communications.Local;
+
+using OpenSim.Region.ClientStack;
namespace OpenSim
{
public class OpenSimMain : RegionApplicationBase, conscmd_callback
{
- // private CheckSumServer checkServer;
protected CommunicationsManager commsManager;
+ // private CheckSumServer checkServer;
private bool m_silent;
private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";
@@ -102,19 +106,17 @@ namespace OpenSim
ClientView.TerrainManager = new TerrainManager(new SecondLife());
- CommunicationsLocal sandboxCommunications = null;
if (m_sandbox)
{
this.SetupLocalGridServers();
// this.checkServer = new CheckSumServer(12036);
// this.checkServer.ServerListener();
- sandboxCommunications = new CommunicationsLocal(this.serversData);
- this.commsManager = sandboxCommunications;
+ this.commsManager = new CommunicationsLocal(this.serversData);
}
else
{
this.SetupRemoteGridServers();
- this.commsManager = new GridCommsManager(this.serversData);
+ this.commsManager = new CommunicationsOGS1(this.serversData);
}
startuptime = DateTime.Now;
@@ -132,7 +134,7 @@ namespace OpenSim
if (m_sandbox)
{
- httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);
+ httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
}
//Start http server
@@ -152,7 +154,7 @@ namespace OpenSim
{
try
{
- AssetCache = new AssetCache("OpenSim.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+ AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
InventoryCache = new InventoryCache();
}
catch (Exception e)
@@ -167,7 +169,7 @@ namespace OpenSim
{
try
{
- AssetCache = new AssetCache("OpenSim.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+ AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
InventoryCache = new InventoryCache();
}
catch (Exception e)
@@ -241,14 +243,21 @@ namespace OpenSim
udpServer.LocalWorld = LocalWorld;
- LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
+ LocalWorld.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
LocalWorld.LoadWorldMap();
m_log.Verbose( "Main.cs:Startup() - Starting up messaging system");
LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
LocalWorld.LoadPrimsFromStorage();
- LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+
+ //Master Avatar Setup
+ UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword);
+ if (masterAvatar != null)
+ {
+ LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
+ LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+ }
LocalWorld.StartTimer();
@@ -358,23 +367,23 @@ namespace OpenSim
case "":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
- OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+ OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
break;
case "basicphysics":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
- OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+ OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
break;
case "RealPhysX":
this.m_physicsEngine = "RealPhysX";
- OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+ OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
break;
case "OpenDynamicsEngine":
this.m_physicsEngine = "OpenDynamicsEngine";
- OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+ OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
break;
}
@@ -433,13 +442,6 @@ namespace OpenSim
}
break;
- case "script":
- for (int i = 0; i < m_localWorld.Count; i++)
- {
- ((Scene)m_localWorld[i]).scriptManager.RunScriptCmd(cmdparams);
- }
- break;
-
case "shutdown":
Shutdown();
break;
@@ -463,7 +465,7 @@ namespace OpenSim
m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
break;
case "users":
- OpenSim.Region.Scenes.ScenePresence TempAv;
+ OpenSim.Region.Environment.Scenes.ScenePresence TempAv;
m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
/* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
{
diff --git a/OpenSim/OpenSim.RegionServer/VersionInfo.cs b/OpenSim/Region/Application/VersionInfo.cs
similarity index 100%
rename from OpenSim/OpenSim.RegionServer/VersionInfo.cs
rename to OpenSim/Region/Application/VersionInfo.cs
diff --git a/OpenSim/OpenSim.Caches/AssetCache.cs b/OpenSim/Region/Caches/AssetCache.cs
similarity index 97%
rename from OpenSim/OpenSim.Caches/AssetCache.cs
rename to OpenSim/Region/Caches/AssetCache.cs
index d0cc370e80..6cf921b3a1 100644
--- a/OpenSim/OpenSim.Caches/AssetCache.cs
+++ b/OpenSim/Region/Caches/AssetCache.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
-namespace OpenSim.Caches
+namespace OpenSim.Region.Caches
{
public delegate void DownloadComplete(AssetCache.TextureSender sender);
diff --git a/OpenSim/OpenSim.Caches/OpenSim.Caches.csproj b/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj
similarity index 87%
rename from OpenSim/OpenSim.Caches/OpenSim.Caches.csproj
rename to OpenSim/Region/Caches/OpenSim.Region.Caches.csproj
index 07e4960192..4a73d08dac 100644
--- a/OpenSim/OpenSim.Caches/OpenSim.Caches.csproj
+++ b/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {1938EB12-0000-0000-0000-000000000000}
+ {61FCCDB3-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.Caches
+ OpenSim.Region.Caches
JScript
Grid
IE50
false
Library
- OpenSim.Caches
+ OpenSim.Region.Caches
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -72,7 +72,7 @@
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build
similarity index 86%
rename from Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
rename to OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build
index 075ea7f588..3ca89e8af0 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,10 +8,10 @@
-
+
-
+
@@ -19,6 +19,7 @@
+
diff --git a/OpenSim/OpenSim.Caches/Properties/AssemblyInfo.cs b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
similarity index 90%
rename from OpenSim/OpenSim.Caches/Properties/AssemblyInfo.cs
rename to OpenSim/Region/Caches/Properties/AssemblyInfo.cs
index 00f5dfe84b..5e6ecbb874 100644
--- a/OpenSim/OpenSim.Caches/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Caches")]
+[assembly: AssemblyTitle("OpenSim.Region.Caches")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Caches")]
+[assembly: AssemblyProduct("OpenSim.Region.Caches")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
similarity index 83%
rename from OpenSim/OpenSim.Region/Caps.cs
rename to OpenSim/Region/Capabilities/Caps.cs
index 13a351d892..416a6bcda3 100644
--- a/OpenSim/OpenSim.Region/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -1,17 +1,44 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* 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
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using System.IO;
using System.Xml;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
using OpenSim.Framework;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Types;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
using libsecondlife;
-namespace OpenSim.Region
+namespace OpenSim.Region.Capabilities
{
public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
@@ -126,14 +153,8 @@ namespace OpenSim.Region
public string ProcessEventQueue(string request, string path, string param)
{
- // Console.WriteLine("event queue request " + request);
string res = "";
- int timer = 0;
-
- /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))
- {
- timer++;
- }*/
+
if (this.CapsEventQueue.Count > 0)
{
lock (this.CapsEventQueue)
diff --git a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs b/OpenSim/Region/Capabilities/LLSDArray.cs
similarity index 85%
rename from Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs
rename to OpenSim/Region/Capabilities/LLSDArray.cs
index ca50be05b4..76d5a2cc9a 100644
--- a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptEngine.cs
+++ b/OpenSim/Region/Capabilities/LLSDArray.cs
@@ -26,16 +26,20 @@
*
*/
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Text;
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Region.Capabilities
{
- public interface IScriptEngine
+ [LLSDType("ARRAY")]
+ public class LLSDArray
{
- bool Init(IScriptAPI api);
- string GetName();
- void LoadScript(string script, string scriptName, uint entityID);
- void OnFrame();
+ public ArrayList Array = new ArrayList();
+
+ public LLSDArray()
+ {
+
+ }
}
}
diff --git a/OpenSim/Region/Capabilities/LLSDCapEvent.cs b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
new file mode 100644
index 0000000000..d47d25c8d0
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* 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
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDCapEvent
+ {
+ public int id = 0;
+ public LLSDArray events = new LLSDArray();
+
+ public LLSDCapEvent()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
new file mode 100644
index 0000000000..d6db6063d3
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDCapsDetails
+ {
+ public string MapLayer = "";
+ public string NewFileAgentInventory = "";
+ //public string EventQueueGet = "";
+
+ public LLSDCapsDetails()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDEmpty.cs b/OpenSim/Region/Capabilities/LLSDEmpty.cs
new file mode 100644
index 0000000000..68f1ce9a71
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDEmpty.cs
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* 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
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDEmpty
+ {
+ public LLSDEmpty()
+ {
+
+ }
+ }
+}
diff --git a/Common/OpenSim.Framework/LLSDHelpers.cs b/OpenSim/Region/Capabilities/LLSDHelpers.cs
similarity index 63%
rename from Common/OpenSim.Framework/LLSDHelpers.cs
rename to OpenSim/Region/Capabilities/LLSDHelpers.cs
index 051520c62d..76d9345fde 100644
--- a/Common/OpenSim.Framework/LLSDHelpers.cs
+++ b/OpenSim/Region/Capabilities/LLSDHelpers.cs
@@ -1,3 +1,30 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* 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
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
using System;
using System.Collections;
using System.Collections.Generic;
@@ -6,7 +33,7 @@ using System.IO;
using System.Xml;
using libsecondlife;
-namespace OpenSim.Framework
+namespace OpenSim.Region.Capabilities
{
public class LLSDHelpers
{
@@ -46,7 +73,6 @@ namespace OpenSim.Framework
}
else
{
- //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
writer.WriteStartElement(String.Empty, "key", String.Empty);
writer.WriteString(fields[i].Name);
writer.WriteEndElement();
@@ -59,12 +85,15 @@ namespace OpenSim.Framework
// LLSDArray arrayObject = obj as LLSDArray;
// ArrayList a = arrayObject.Array;
ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
- writer.WriteStartElement(String.Empty, "array", String.Empty);
- foreach (object item in a)
+ if (a != null)
{
- SerializeLLSDType(writer, item);
+ writer.WriteStartElement(String.Empty, "array", String.Empty);
+ foreach (object item in a)
+ {
+ SerializeLLSDType(writer, item);
+ }
+ writer.WriteEndElement();
}
- writer.WriteEndElement();
break;
}
}
@@ -115,132 +144,22 @@ namespace OpenSim.Framework
}
}
- [LLSDType("MAP")]
- public class LLSDMapLayerResponse
- {
- public LLSDMapRequest AgentData = new LLSDMapRequest();
- public LLSDArray LayerData = new LLSDArray();
+
- public LLSDMapLayerResponse()
- {
+
- }
- }
+
- [LLSDType("MAP")]
- public class LLSDCapsDetails
- {
- public string MapLayer = "";
- public string NewFileAgentInventory = "";
- //public string EventQueueGet = "";
+
- public LLSDCapsDetails()
- {
+
- }
- }
+
- [LLSDType("MAP")]
- public class LLSDMapLayer
- {
- public int Left = 0;
- public int Right = 0;
- public int Top = 0;
- public int Bottom = 0;
- public LLUUID ImageID = LLUUID.Zero;
+
- public LLSDMapLayer()
- {
-
- }
- }
-
- [LLSDType("ARRAY")]
- public class LLSDArray
- {
- public ArrayList Array = new ArrayList();
-
- public LLSDArray()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDMapRequest
- {
- public int Flags = 0;
-
- public LLSDMapRequest()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDUploadReply
- {
- public string new_asset = "";
- public LLUUID new_inventory_item = LLUUID.Zero;
- public string state = "";
-
- public LLSDUploadReply()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDCapEvent
- {
- public int id = 0;
- public LLSDArray events = new LLSDArray();
-
- public LLSDCapEvent()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDEmpty
- {
- public LLSDEmpty()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDTest
- {
- public int Test1 = 20;
- public int Test2 = 10;
-
- public LLSDTest()
- {
-
- }
- }
+
- [AttributeUsage(AttributeTargets.Class)]
- public class LLSDType : Attribute
- {
- private string myType;
-
- public LLSDType(string type)
- {
- myType = type;
-
- }
-
- public string ObjectType
- {
- get
- {
- return myType;
- }
- }
- }
+
}
diff --git a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs b/OpenSim/Region/Capabilities/LLSDMapLayer.cs
similarity index 78%
rename from Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
rename to OpenSim/Region/Capabilities/LLSDMapLayer.cs
index 8d8a647a32..b097ec3d78 100644
--- a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
+++ b/OpenSim/Region/Capabilities/LLSDMapLayer.cs
@@ -26,26 +26,25 @@
*
*/
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Text;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
+
using libsecondlife;
-namespace OpenGrid.Framework.Communications
+namespace OpenSim.Region.Capabilities
{
-
- public class CommunicationsManager
+ [LLSDType("MAP")]
+ public class LLSDMapLayer
{
- public IUserServices UserServer;
- public IGridServices GridServer;
- public IInterRegionCommunications InterRegion;
+ public int Left = 0;
+ public int Right = 0;
+ public int Top = 0;
+ public int Bottom = 0;
+ public LLUUID ImageID = LLUUID.Zero;
- public CommunicationsManager(NetworkServersInfo serversInfo)
+ public LLSDMapLayer()
{
-
+
}
}
}
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
new file mode 100644
index 0000000000..ee37a5b899
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* 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
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDMapLayerResponse
+ {
+ public LLSDMapRequest AgentData = new LLSDMapRequest();
+ public LLSDArray LayerData = new LLSDArray();
+
+ public LLSDMapLayerResponse()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapRequest.cs b/OpenSim/Region/Capabilities/LLSDMapRequest.cs
new file mode 100644
index 0000000000..b15f1be215
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapRequest.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDMapRequest
+ {
+ public int Flags = 0;
+
+ public LLSDMapRequest()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDTest.cs b/OpenSim/Region/Capabilities/LLSDTest.cs
new file mode 100644
index 0000000000..3948f2c46a
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDTest.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* 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
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDTest
+ {
+ public int Test1 = 20;
+ public int Test2 = 10;
+
+ public LLSDTest()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDType.cs b/OpenSim/Region/Capabilities/LLSDType.cs
new file mode 100644
index 0000000000..7da5861b15
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDType.cs
@@ -0,0 +1,53 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* 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
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+ [AttributeUsage(AttributeTargets.Class)]
+ public class LLSDType : Attribute
+ {
+ private string myType;
+
+ public LLSDType(string type)
+ {
+ myType = type;
+
+ }
+
+ public string ObjectType
+ {
+ get
+ {
+ return myType;
+ }
+ }
+ }
+}
diff --git a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
similarity index 84%
rename from Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs
rename to OpenSim/Region/Capabilities/LLSDUploadReply.cs
index 0c1627bbc9..83cf166f1a 100644
--- a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs
+++ b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
@@ -28,15 +28,20 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenSim.Framework.Types;
using libsecondlife;
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Region.Capabilities
{
- public interface IScriptAPI
+ [LLSDType("MAP")]
+ public class LLSDUploadReply
{
- LLVector3 GetEntityPosition(uint localID);
- void SetEntityPosition(uint localID, float x, float y, float z);
- uint GetRandomAvatarID();
+ public string new_asset = "";
+ public LLUUID new_inventory_item = LLUUID.Zero;
+ public string state = "";
+
+ public LLSDUploadReply()
+ {
+
+ }
}
}
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
new file mode 100644
index 0000000000..4667d525d0
--- /dev/null
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -0,0 +1,143 @@
+
+
+ Local
+ 8.0.50727
+ 2.0
+ {39038E85-0000-0000-0000-000000000000}
+ Debug
+ AnyCPU
+
+
+
+ OpenSim.Region.Capabilities
+ JScript
+ Grid
+ IE50
+ false
+ Library
+
+ OpenSim.Region.Capabilities
+
+
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE
+
+ False
+ 4096
+ True
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+
+ ..\..\..\bin\libsecondlife.dll
+ False
+
+
+ System.dll
+ False
+
+
+ System.Xml.dll
+ False
+
+
+ ..\..\..\bin\XMLRPC.dll
+ False
+
+
+
+
+ OpenSim.Framework
+ {8ACA2445-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Servers
+ {2CC71860-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Caches
+ {61FCCDB3-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
new file mode 100644
index 0000000000..a091b5c043
--- /dev/null
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
similarity index 97%
rename from OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs
rename to OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index 5d5021c549..da74f8552b 100644
--- a/OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -35,6 +35,7 @@ using libsecondlife.Packets;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
+using OpenSim.Region.ClientStack;
namespace OpenSim.Assets
{
diff --git a/OpenSim/OpenSim.RegionServer/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
similarity index 96%
rename from OpenSim/OpenSim.RegionServer/ClientStackNetworkHandler.cs
rename to OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
index 755219559a..f99cf79cb4 100644
--- a/OpenSim/OpenSim.RegionServer/ClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -33,7 +33,7 @@ using System.Net.Sockets;
using libsecondlife;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public interface ClientStackNetworkHandler
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
similarity index 97%
rename from OpenSim/OpenSim.RegionServer/ClientView.API.cs
rename to OpenSim/Region/ClientStack/ClientView.API.cs
index 902f3c77fc..9650b42f1f 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Types;
using libsecondlife;
using libsecondlife.Packets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
partial class ClientView
{
@@ -68,6 +68,8 @@ namespace OpenSim
public event GenericCall6 OnRemoveAvatar;
public event RequestMapBlocks OnRequestMapBlocks;
public event TeleportLocationRequest OnTeleportLocationRequest;
+
+ public event UUIDNameRequest OnNameFromUUIDRequest;
public event ParcelPropertiesRequest OnParcelPropertiesRequest;
public event ParcelDivideRequest OnParcelDivideRequest;
@@ -75,7 +77,6 @@ namespace OpenSim
public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
public event EstateOwnerMessageRequest OnEstateOwnerMessage;
-
///
///
///
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
similarity index 97%
rename from OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
rename to OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
index 914c38a496..bc6cc21533 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -32,11 +32,11 @@ using OpenSim.Assets;
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
using libsecondlife;
using libsecondlife.Packets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
partial class ClientView
{
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
similarity index 97%
rename from OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
rename to OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 32aed026fd..0456e3cf91 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
using OpenSim.Assets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public partial class ClientView
{
@@ -192,7 +192,5 @@ namespace OpenSim
this.OutPacket(mbReply);
*/
}
-
-
}
}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
similarity index 96%
rename from OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
rename to OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 191ef2133c..794ce79a6a 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
using OpenSim.Assets;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public partial class ClientView
{
@@ -492,7 +492,13 @@ namespace OpenSim
case PacketType.MoneyBalanceRequest:
this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
break;
-
+ case PacketType.UUIDNameRequest:
+ UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
+ foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
+ {
+ OnNameFromUUIDRequest(UUIDBlock.ID, this);
+ }
+ break;
#region Parcel related packets
case PacketType.ParcelPropertiesRequest:
ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
similarity index 96%
rename from OpenSim/OpenSim.RegionServer/ClientView.cs
rename to OpenSim/Region/ClientStack/ClientView.cs
index 312da9dbac..9c4462d593 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -42,9 +42,9 @@ using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public delegate bool PacketMethod(ClientView simClient, Packet packet);
diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
similarity index 96%
rename from OpenSim/OpenSim.RegionServer/ClientViewBase.cs
rename to OpenSim/Region/ClientStack/ClientViewBase.cs
index 8b503f0362..7d3940590c 100644
--- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -39,7 +39,7 @@ using System.Timers;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Interfaces;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public class ClientViewBase
{
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
similarity index 66%
rename from OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
rename to OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index b1ce3ebd0e..3093eb0ef4 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {632E1BFD-0000-0000-0000-000000000000}
+ {DC3698B2-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.RegionServer
+ OpenSim.Region.ClientStack
JScript
Grid
IE50
false
Library
- OpenSim.RegionServer
+ OpenSim.Region.ClientStack
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,15 +59,15 @@
- ..\..\bin\Axiom.MathLib.dll
+ ..\..\..\bin\Axiom.MathLib.dll
False
- ..\..\bin\Db4objects.Db4o.dll
+ ..\..\..\bin\Db4objects.Db4o.dll
False
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -78,59 +78,45 @@
System.Xml.dll
False
+
+ ..\..\..\bin\XMLRPC.dll
+ False
+
-
- OpenSim.Caches
- {1938EB12-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.GenericConfig.Xml
- {E88EF749-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Servers
+ {2CC71860-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Physics.Manager
- {8BE16150-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Caches
+ {61FCCDB3-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Region
- {196916AF-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Physics.Manager
+ {F4FF31EB-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Servers
- {8BB20F0A-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Terrain.BasicTerrain
- {2270B8FE-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- XMLRPC
- {8E81D43C-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Terrain.BasicTerrain
+ {C9E0F891-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
@@ -166,9 +152,6 @@
Code
-
- Code
-
Code
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
similarity index 65%
rename from OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
rename to OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 12dca8a2c6..f76a4c8871 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -21,7 +21,6 @@
-
@@ -29,25 +28,23 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
similarity index 96%
rename from OpenSim/OpenSim.RegionServer/PacketServer.cs
rename to OpenSim/Region/ClientStack/PacketServer.cs
index 229570cfdd..ffd254ea1a 100644
--- a/OpenSim/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -34,9 +34,9 @@ using OpenSim.Framework;
using System.Net;
using System.Net.Sockets;
using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public class PacketServer
{
diff --git a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
similarity index 94%
rename from OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
rename to OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 68a140bf68..94db8ee411 100644
--- a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -37,19 +37,18 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework;
using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
using OpenSim.Framework.Console;
using OpenSim.Physics.Manager;
using Nwc.XmlRpc;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
+using OpenSim.Framework.Servers;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public class RegionApplicationBase
{
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
similarity index 95%
rename from OpenSim/OpenSim.RegionServer/UDPServer.cs
rename to OpenSim/Region/ClientStack/UDPServer.cs
index f2a02d9306..259352c9f1 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -37,18 +37,17 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
using OpenSim.Framework.Console;
using OpenSim.Framework;
using Nwc.XmlRpc;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
+using OpenSim.Framework.Servers;
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
{
public class UDPServer : ClientStackNetworkHandler
diff --git a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
similarity index 87%
rename from OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
rename to OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 743b9b4b03..bacaa3e634 100644
--- a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -33,10 +33,9 @@ using libsecondlife;
using OpenSim.Framework;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
-
-namespace OpenSim.LocalCommunications
+namespace OpenSim.Region.Communications.Local
{
public class CommunicationsLocal : CommunicationsManager
{
@@ -46,8 +45,8 @@ namespace OpenSim.LocalCommunications
public CommunicationsLocal(NetworkServersInfo serversInfo)
: base(serversInfo)
{
- UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
- UserServices.AddPlugin("OpenGrid.Framework.Data.DB4o.dll");
+ UserServices = new LocalUserServices(this,this.ServersInfo.DefaultHomeLocX,this.ServersInfo.DefaultHomeLocY);
+ UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
UserServer = UserServices;
GridServer = SandBoxServices;
InterRegion = SandBoxServices;
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
similarity index 95%
rename from OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs
rename to OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index ce48c6e418..26834be764 100644
--- a/OpenSim/OpenSim.LocalCommunications/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -28,12 +28,12 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Communications;
using libsecondlife;
using OpenSim.Framework.Types;
using OpenSim.Framework;
+using OpenSim.Framework.Communications;
-namespace OpenSim.LocalCommunications
+namespace OpenSim.Region.Communications.Local
{
public class LocalBackEndServices : IGridServices, IInterRegionCommunications
@@ -182,7 +182,6 @@ namespace OpenSim.LocalCommunications
///
public bool AddNewSession(ulong regionHandle, Login loginData)
{
- //Console.WriteLine(" comms manager been told to expect new user");
AgentCircuitData agent = new AgentCircuitData();
agent.AgentID = loginData.Agent;
agent.firstname = loginData.First;
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
similarity index 76%
rename from OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
rename to OpenSim/Region/Communications/Local/LocalUserServices.cs
index a7f7aa4842..6cf254bd8b 100644
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -3,16 +3,16 @@ using System.Collections;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
//using OpenSim.Framework.User;
-using OpenGrid.Framework.UserManagement;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.UserManagement;
+using OpenSim.Framework.Data;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
using libsecondlife;
-namespace OpenSim.LocalCommunications
+namespace OpenSim.Region.Communications.Local
{
public class LocalUserServices : UserManagerBase, IUserServices
{
@@ -36,6 +36,7 @@ namespace OpenSim.LocalCommunications
{
return this.getUserProfile(name);
}
+
public UserProfileData GetUserProfile(LLUUID avatarID)
{
return this.getUserProfile(avatarID);
@@ -87,7 +88,7 @@ namespace OpenSim.LocalCommunications
"'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
"'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
string capsPath = Util.GetRandomCapsPath();
- response.SimAddress = reg.CommsIPListenAddr;
+ response.SimAddress = reg.CommsExternalAddress;
response.SimPort = (Int32)reg.CommsIPListenPort;
response.RegionX = reg.RegionLocX ;
response.RegionY = reg.RegionLocY ;
@@ -114,5 +115,31 @@ namespace OpenSim.LocalCommunications
}
+ public UserProfileData SetupMasterUser(string firstName, string lastName)
+ {
+ return SetupMasterUser(firstName, lastName, "");
+ }
+
+ public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
+ {
+ UserProfileData profile = getUserProfile(firstName, lastName);
+ if (profile != null)
+ {
+
+ return profile;
+ }
+
+ Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account");
+ this.AddUserProfile(firstName, lastName, password, defaultHomeX, defaultHomeY);
+
+ profile = getUserProfile(firstName, lastName);
+
+ if (profile == null)
+ {
+ Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here.");
+ }
+
+ return profile;
+ }
}
}
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
similarity index 76%
rename from OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
rename to OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 3cb36da469..0a15a49104 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {79CED992-0000-0000-0000-000000000000}
+ {BFB5D807-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.LocalCommunications
+ OpenSim.Region.Communications.Local
JScript
Grid
IE50
false
Library
- OpenSim.LocalCommunications
+ OpenSim.Region.Communications.Local
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\bin\libsecondlife.dll
+ ..\..\..\..\bin\libsecondlife.dll
False
@@ -72,30 +72,30 @@
-
- OpenGrid.Framework.Communications
- {683344D5-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenGrid.Framework.UserManagement
- {DA9A7391-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
+
+ OpenSim.Framework.Communications
+ {CB52B7E7-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.UserManagement
+ {586E2916-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
similarity index 71%
rename from OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
rename to OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index 2b72e2d37b..3cac9d3d50 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -21,18 +21,18 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.LocalCommunications/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
similarity index 88%
rename from OpenSim/OpenSim.LocalCommunications/Properties/AssemblyInfo.cs
rename to OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
index 8e6e7117bd..1eb7107e10 100644
--- a/OpenSim/OpenSim.LocalCommunications/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.LocalCommunications")]
+[assembly: AssemblyTitle("OpenSim.Region.Communications.Local")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.LocalCommunications")]
+[assembly: AssemblyProduct("OpenSim.Region.Communications.Local")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
new file mode 100644
index 0000000000..870f5772cb
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+namespace OpenSim.Region.Communications.OGS1
+{
+ public class CommunicationsOGS1 : CommunicationsManager
+ {
+ private OGS1GridServices gridInterComms = new OGS1GridServices();
+ public CommunicationsOGS1(NetworkServersInfo serversInfo) :base(serversInfo)
+ {
+ GridServer = gridInterComms;
+ InterRegion = gridInterComms;
+ UserServer = new OGS1UserServices(this);
+ }
+ }
+}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
similarity index 96%
rename from Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
rename to OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index db64f0c8c1..5f0c80cc40 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -6,15 +6,15 @@ using System.Runtime.Remoting;
using System.Runtime.Remoting.Channels;
using System.Runtime.Remoting.Channels.Tcp;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
using OpenSim.Framework;
using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
using Nwc.XmlRpc;
using libsecondlife;
-namespace OpenGrid.Framework.Communications.OGS1
+namespace OpenSim.Region.Communications.OGS1
{
public class OGS1GridServices : IGridServices, IInterRegionCommunications
{
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
similarity index 92%
rename from Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
rename to OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 3d74e2ffbb..51b33e9d8a 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -2,8 +2,8 @@ using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
-namespace OpenGrid.Framework.Communications.OGS1
+using OpenSim.Framework.Communications;
+namespace OpenSim.Region.Communications.OGS1
{
public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
new file mode 100644
index 0000000000..856c447e3c
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Data;
+using libsecondlife;
+
+using Nwc.XmlRpc;
+
+namespace OpenSim.Region.Communications.OGS1
+{
+ public class OGS1UserServices :IUserServices
+ {
+ CommunicationsOGS1 m_parent;
+ public OGS1UserServices(CommunicationsOGS1 parent)
+ {
+ m_parent = parent;
+ }
+
+ public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
+ {
+ if (data.Contains("error_type"))
+ {
+ Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] + "): " + data["error_desc"]);
+ return null;
+ }
+
+ UserProfileData userData = new UserProfileData();
+ userData.username = (string)data["firstname"];
+ userData.surname = (string)data["lastname"];
+ userData.UUID = new LLUUID((string)data["uuid"]);
+ userData.userInventoryURI = (string)data["server_inventory"];
+ userData.userAssetURI = (string)data["server_asset"];
+ userData.profileFirstText = (string)data["profile_firstlife_about"];
+ userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
+ userData.profileCanDoMask = (uint)data["profile_can_do"];
+ userData.profileWantDoMask = (uint)data["profile_want_do"];
+ userData.profileImage = new LLUUID((string)data["profile_image"]);
+ userData.lastLogin = (int)data["profile_lastlogin"];
+ userData.homeLocation = new LLVector3();
+ userData.homeLookAt = new LLVector3();
+
+ return userData;
+ }
+ public UserProfileData GetUserProfile(string firstName, string lastName)
+ {
+ return GetUserProfile(firstName + " " + lastName);
+ }
+ public UserProfileData GetUserProfile(string name)
+ {
+
+ try
+ {
+ Hashtable param = new Hashtable();
+ param["avatar_name"] = name;
+ IList parameters = new ArrayList();
+ parameters.Add(param);
+ XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
+ XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+ Hashtable respData = (Hashtable)resp.Value;
+
+ return ConvertXMLRPCDataToUserProfile(respData);
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
+ }
+ return null;
+ }
+ public UserProfileData GetUserProfile(LLUUID avatarID)
+ {
+ try
+ {
+
+ Hashtable param = new Hashtable();
+ param["avatar_uuid"] = avatarID.ToString();
+ IList parameters = new ArrayList();
+ parameters.Add(param);
+ XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
+ XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+ Hashtable respData = (Hashtable)resp.Value;
+
+ return ConvertXMLRPCDataToUserProfile(respData);
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine("Error when trying to fetch profile data by uuid from remote user server: " + e.Message);
+ }
+ return null;
+ }
+
+ public UserProfileData SetupMasterUser(string firstName, string lastName)
+ {
+ return SetupMasterUser(firstName, lastName, "");
+ }
+
+ public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
+ {
+ UserProfileData profile = GetUserProfile(firstName, lastName);
+ if (profile == null)
+ {
+ Console.WriteLine("Unknown Master User. Grid Mode: No clue what I should do. Probably would choose the grid owner UUID when that is implemented");
+ }
+ return null;
+ }
+ }
+}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
similarity index 72%
rename from Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
rename to OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 804ddba422..d6abd13554 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {17442AF1-0000-0000-0000-000000000000}
+ {4806E378-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenGrid.Framework.Communications.OGS1
+ OpenSim.Region.Communications.OGS1
JScript
Grid
IE50
false
Library
- OpenGrid.Framework.Communications.OGS1
+ OpenSim.Region.Communications.OGS1
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\bin\libsecondlife.dll
+ ..\..\..\..\bin\libsecondlife.dll
False
@@ -78,56 +78,54 @@
System.Xml.dll
False
+
+ ..\..\..\..\bin\XMLRPC.dll
+ False
+
-
- OpenGrid.Framework.Communications
- {683344D5-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
+ OpenSim.Framework.Communications
+ {CB52B7E7-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Servers
- {8BB20F0A-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Data
+ {36B72A9B-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- XMLRPC
- {8E81D43C-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Servers
+ {2CC71860-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
Code
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
new file mode 100644
index 0000000000..04d61b9a11
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
similarity index 100%
rename from Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs
rename to OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Region/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
similarity index 97%
rename from OpenSim/OpenSim.Region/EstateManager.cs
rename to OpenSim/Region/Environment/EstateManager.cs
index dcb556499f..c2c1ecf3ea 100644
--- a/OpenSim/OpenSim.Region/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -30,15 +30,15 @@ using System.Collections.Generic;
using System.Text;
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
-using OpenSim.Region;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
using OpenSim;
using libsecondlife;
using libsecondlife.Packets;
-using Avatar = OpenSim.Region.Scenes.ScenePresence;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
-namespace OpenSim.Region
+namespace OpenSim.Region.Environment
{
///
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
similarity index 71%
rename from OpenSim/OpenSim.Region/OpenSim.Region.csproj
rename to OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 79f204d347..428f3812a7 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {196916AF-0000-0000-0000-000000000000}
+ {DCBA491C-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.Region
+ OpenSim.Region.Environment
JScript
Grid
IE50
false
Library
- OpenSim.Region
+ OpenSim.Region.Environment
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,15 +59,15 @@
- ..\..\bin\Axiom.MathLib.dll
+ ..\..\..\bin\Axiom.MathLib.dll
False
- ..\..\bin\Db4objects.Db4o.dll
+ ..\..\..\bin\Db4objects.Db4o.dll
False
- ..\..\bin\libsecondlife.dll
+ ..\..\..\bin\libsecondlife.dll
False
@@ -82,71 +82,68 @@
System.Xml.dll
False
-
- VJSharpCodeProvider.dll
+
+ ..\..\..\bin\XMLRPC.dll
False
-
- OpenGrid.Framework.Communications
- {683344D5-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Caches
- {1938EB12-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
+ OpenSim.Framework.Communications
+ {CB52B7E7-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.GenericConfig.Xml
- {E88EF749-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.GenericConfig.Xml
+ {C74E4A30-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Physics.Manager
- {8BE16150-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Servers
+ {2CC71860-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Servers
- {8BB20F0A-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Caches
+ {61FCCDB3-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Terrain.BasicTerrain
- {2270B8FE-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Capabilities
+ {39038E85-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- XMLRPC
- {8E81D43C-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Physics.Manager
+ {F4FF31EB-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Terrain.BasicTerrain
+ {C9E0F891-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- Code
-
Code
@@ -171,9 +168,6 @@
Code
-
- Code
-
Code
@@ -207,9 +201,6 @@
Code
-
- Code
-
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
similarity index 66%
rename from OpenSim/OpenSim.Region/OpenSim.Region.dll.build
rename to OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 926b9ed184..2fa5e7610a 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,10 +8,9 @@
-
+
-
@@ -20,7 +19,6 @@
-
@@ -32,34 +30,33 @@
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.Region/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
similarity index 96%
rename from OpenSim/OpenSim.Region/ParcelManager.cs
rename to OpenSim/Region/Environment/ParcelManager.cs
index d15d77d8e9..1cab4ab1c3 100644
--- a/OpenSim/OpenSim.Region/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -32,10 +32,10 @@ using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-using OpenSim.Region.Scenes;
-using Avatar = OpenSim.Region.Scenes.ScenePresence;
+using OpenSim.Region.Environment.Scenes;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
-namespace OpenSim.Region
+namespace OpenSim.Region.Environment
{
@@ -420,7 +420,7 @@ namespace OpenSim.Region
{
for (y = 0; y < inc_y; y++)
{
- OpenSim.Region.Parcel currentParcel = getParcel(start_x + x, start_y + y);
+ OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);
if (!temp.Contains(currentParcel))
{
currentParcel.forceUpdateParcelInfo();
diff --git a/OpenSim/OpenSim.Region/RegionManager.cs b/OpenSim/Region/Environment/RegionManager.cs
similarity index 79%
rename from OpenSim/OpenSim.Region/RegionManager.cs
rename to OpenSim/Region/Environment/RegionManager.cs
index a317f0f2c2..4ff55a8ba4 100644
--- a/OpenSim/OpenSim.Region/RegionManager.cs
+++ b/OpenSim/Region/Environment/RegionManager.cs
@@ -1,12 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
using OpenSim.Framework;
using OpenSim.Framework.Types;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
+using OpenSim.Region.Capabilities;
-namespace OpenSim.Region
+namespace OpenSim.Region.Environment
{
public class RegionManager //needs renaming , but first we need to rename the namespace
{
diff --git a/OpenSim/OpenSim.Region/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
similarity index 96%
rename from OpenSim/OpenSim.Region/Scenes/Entity.cs
rename to OpenSim/Region/Environment/Scenes/Entity.cs
index 77f8854fbf..db5070d99b 100644
--- a/OpenSim/OpenSim.Region/Scenes/Entity.cs
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -32,7 +32,7 @@ using Axiom.MathLib;
using OpenSim.Physics.Manager;
using libsecondlife;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
{
public abstract class Entity
{
diff --git a/OpenSim/OpenSim.Region/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
similarity index 90%
rename from OpenSim/OpenSim.Region/Scenes/IScenePresenceBody.cs
rename to OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
index 65077e656f..36023d0aba 100644
--- a/OpenSim/OpenSim.Region/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
@@ -7,7 +7,7 @@ using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
{
public interface IScenePresenceBody
{
diff --git a/OpenSim/OpenSim.Region/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
similarity index 96%
rename from OpenSim/OpenSim.Region/Scenes/Primitive.cs
rename to OpenSim/Region/Environment/Scenes/Primitive.cs
index e04c711783..0f649b2145 100644
--- a/OpenSim/OpenSim.Region/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -36,7 +36,7 @@ using OpenSim.Physics.Manager;
using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
{
public class Primitive : Entity
{
@@ -174,9 +174,9 @@ namespace OpenSim.Region.Scenes
dataArrays.Add(primData.ToBytes());
foreach (Entity child in children)
{
- if (child is OpenSim.Region.Scenes.Primitive)
+ if (child is OpenSim.Region.Environment.Scenes.Primitive)
{
- dataArrays.Add(((OpenSim.Region.Scenes.Primitive)child).GetByteArray());
+ dataArrays.Add(((OpenSim.Region.Environment.Scenes.Primitive)child).GetByteArray());
}
}
byte[] primstart = Helpers.StringToField("");
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
similarity index 95%
rename from OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
rename to OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index d1a2717993..1d55c4d924 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
{
public partial class Scene
{
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Scenes
{
if (ent.LocalId == primLocalID)
{
- ((OpenSim.Region.Scenes.Primitive)ent).GetProperites(remoteClient);
+ ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);
break;
}
}
@@ -266,7 +266,7 @@ namespace OpenSim.Region.Scenes
{
if (ent.LocalId == localID)
{
- ((OpenSim.Region.Scenes.Primitive)ent).UpdatePosition(pos);
+ ((OpenSim.Region.Environment.Scenes.Primitive)ent).UpdatePosition(pos);
break;
}
}
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
similarity index 95%
rename from OpenSim/OpenSim.Region/Scenes/Scene.cs
rename to OpenSim/Region/Environment/Scenes/Scene.cs
index f7d90fa077..8c912d0206 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -39,18 +39,20 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
using OpenSim.Framework;
-using OpenSim.Terrain;
-using OpenGrid.Framework.Communications;
-using OpenSim.Caches;
-using OpenSim.Region;
-using OpenSim.Servers;
-using OpenSim.Scripting;
+using OpenSim.Region.Terrain;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Caches;
+using OpenSim.Region.Environment;
+using OpenSim.Framework.Servers;
+using OpenSim.Region.Enviorment.Scripting;
+using OpenSim.Region.Capabilities;
+using Caps = OpenSim.Region.Capabilities.Caps;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
{
public delegate bool FilterAvatarList(ScenePresence avatar);
- public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
+ public partial class Scene : SceneBase, ILocalStorageReceiver
{
protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
protected Dictionary Avatars;
@@ -66,7 +68,7 @@ namespace OpenSim.Region.Scenes
protected RegionCommsListener regionCommsHost;
protected CommunicationsManager commsManager;
- protected Dictionary capsHandlers = new Dictionary();
+ protected Dictionary capsHandlers = new Dictionary();
protected BaseHttpServer httpListener;
public ParcelManager parcelManager;
@@ -503,6 +505,7 @@ namespace OpenSim.Region.Scenes
remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
//remoteClient.OnObjectSelect += this.SelectPrim;
remoteClient.OnGrapUpdate += this.MoveObject;
+ remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
/* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
@@ -510,7 +513,7 @@ namespace OpenSim.Region.Scenes
remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
*/
-
+
ScenePresence newAvatar = null;
try
{
diff --git a/OpenSim/OpenSim.Region/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
similarity index 95%
rename from OpenSim/OpenSim.Region/Scenes/SceneBase.cs
rename to OpenSim/Region/Environment/Scenes/SceneBase.cs
index 5275fcfbf2..50d3b8200b 100644
--- a/OpenSim/OpenSim.Region/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -37,10 +37,10 @@ using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
-using OpenSim.Terrain;
-using OpenSim.Caches;
+using OpenSim.Region.Terrain;
+using OpenSim.Region.Caches;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
{
public abstract class SceneBase : IWorld
{
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
new file mode 100644
index 0000000000..fa1bacbd85
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+ ///
+ /// A class for triggering remote scene events.
+ ///
+ public class EventManager
+ {
+ public delegate void OnFrameDelegate();
+ public event OnFrameDelegate OnFrame;
+
+ public delegate void OnNewPresenceDelegate(ScenePresence presence);
+ public event OnNewPresenceDelegate OnNewPresence;
+
+ public delegate void OnNewPrimitiveDelegate(Primitive prim);
+ public event OnNewPrimitiveDelegate OnNewPrimitive;
+
+ public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);
+ public event OnRemovePresenceDelegate OnRemovePresence;
+
+ public void TriggerOnFrame()
+ {
+ if (OnFrame != null)
+ {
+ OnFrame();
+ }
+ }
+
+ public void TriggerOnNewPrimitive(Primitive prim)
+ {
+ if (OnNewPrimitive != null)
+ OnNewPrimitive(prim);
+ }
+
+ public void TriggerOnNewPresence(ScenePresence presence)
+ {
+ if (OnNewPresence != null)
+ OnNewPresence(presence);
+ }
+
+ public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)
+ {
+ if (OnRemovePresence != null)
+ {
+ OnRemovePresence(uuid);
+ }
+ }
+ }
+}
diff --git a/OpenSim/OpenSim.Region/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
similarity index 96%
rename from OpenSim/OpenSim.Region/Scenes/SceneObject.cs
rename to OpenSim/Region/Environment/Scenes/SceneObject.cs
index 5df87bfc93..88fb16034e 100644
--- a/OpenSim/OpenSim.Region/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -35,7 +35,7 @@ using OpenSim.Physics.Manager;
using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
{
public class SceneObject : Entity
{
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
similarity index 94%
rename from OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs
rename to OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index f0a8721e5d..2caabc2d59 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -31,7 +31,7 @@ using System.Text;
using libsecondlife;
using System.Xml;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
{
partial class ScenePresence
{
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes
// OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
- foreach (KeyValuePair kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID)
+ foreach (KeyValuePair kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)
{
AnimsNames.Add(kp.Value, kp.Key);
}
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
similarity index 95%
rename from OpenSim/OpenSim.Region/Scenes/ScenePresence.Body.cs
rename to OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
index d21b11fffd..2c81d2a4d4 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
@@ -34,7 +34,7 @@ using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
{
partial class ScenePresence
{
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
similarity index 83%
rename from OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
rename to OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 45d3fed212..b90004e3e5 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using Axiom.MathLib;
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
{
public partial class ScenePresence : Entity
{
@@ -66,6 +66,17 @@ namespace OpenSim.Region.Scenes
protected RegionInfo m_regionInfo;
+ private Vector3[] Dir_Vectors = new Vector3[6];
+ private enum Dir_ControlFlags
+ {
+ DIR_CONTROL_FLAG_FOWARD = MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS,
+ DIR_CONTROL_FLAG_BACK = MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG,
+ DIR_CONTROL_FLAG_LEFT = MainAvatar.ControlFlags.AGENT_CONTROL_LEFT_POS,
+ DIR_CONTROL_FLAG_RIGHT = MainAvatar.ControlFlags.AGENT_CONTROL_LEFT_NEG,
+ DIR_CONTROL_FLAG_UP = MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS,
+ DIR_CONTROL_FLAG_DOWN = MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG
+ }
+
#region Properties
///
///
@@ -125,6 +136,13 @@ namespace OpenSim.Region.Scenes
// ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
//ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
+ Dir_Vectors[0] = new Vector3(1, 0, 0); //FOWARD
+ Dir_Vectors[1] = new Vector3(-1, 0, 0); //BACK
+ Dir_Vectors[2] = new Vector3(0, 1, 0); //LEFT
+ Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT
+ Dir_Vectors[4] = new Vector3(0, 0, 1); //UP
+ Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN
+
}
#endregion
@@ -216,40 +234,46 @@ namespace OpenSim.Region.Scenes
///
///
public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
- {
- if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
+ {
+ int i = 0;
+ bool update_movementflag = false;
+ bool update_rotation = false;
+ bool DCFlagKeyPressed = false;
+ Vector3 agent_control_v3 = new Vector3(0, 0, 0);
+ Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+
+ this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
+
+ if (q != this.bodyRot)
{
- Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
- if (((movementflag & 1) == 0) || (q != this.bodyRot))
- {
- Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
- this.AddNewMovement(v3, q);
- movementflag = 1;
- this.bodyRot = q;
- }
+ this.bodyRot = q;
+ update_rotation = true;
}
- else if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
+ foreach (Dir_ControlFlags DCF in Enum.GetValues(typeof(Dir_ControlFlags)))
{
- Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
- if (((movementflag & 2) == 0) || (q != this.bodyRot))
- {
- Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
- this.AddNewMovement(v3, q);
- movementflag = 2;
- this.bodyRot = q;
- }
- }
- else
- {
- if ((movementflag) != 0)
+ if ((flags & (uint)DCF) != 0)
{
- NewForce newVelocity = new NewForce();
- newVelocity.X = 0;
- newVelocity.Y = 0;
- newVelocity.Z = 0;
- this.forcesList.Add(newVelocity);
- movementflag = 0;
+ DCFlagKeyPressed = true;
+ agent_control_v3 += Dir_Vectors[i];
+ if ((movementflag & (uint)DCF) == 0)
+ {
+ movementflag += (byte)(uint)DCF;
+ update_movementflag = true;
+ }
}
+ else
+ {
+ if ((movementflag & (uint)DCF) != 0)
+ {
+ movementflag -= (byte)(uint)DCF;
+ update_movementflag = true;
+ }
+ }
+ i++;
+ }
+ if ((update_movementflag) || (update_rotation && DCFlagKeyPressed))
+ {
+ this.AddNewMovement(agent_control_v3, q);
}
}
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
similarity index 96%
rename from OpenSim/OpenSim.Region/Scenes/scripting/Engines/CSharpScriptEngine.cs
rename to OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
index 870303f67a..a232b65563 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/CSharpScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
using System.CodeDom.Compiler;
using Microsoft.CSharp;
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
{
public class CSharpScriptEngine : IScriptCompiler
{
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
similarity index 96%
rename from OpenSim/OpenSim.Region/Scenes/scripting/Engines/JScriptEngine.cs
rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
index ffae1d705f..2d44223bb8 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/JScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
using System.CodeDom.Compiler;
using Microsoft.JScript;
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
{
public class JScriptEngine : IScriptCompiler
{
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
similarity index 88%
rename from OpenSim/OpenSim.Region/Scenes/scripting/Script.cs
rename to OpenSim/Region/Environment/Scenes/scripting/Script.cs
index 56bd1dbddb..1e6467579d 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -31,10 +31,10 @@ using System.Text;
using OpenSim.Framework.Console;
using OpenSim.Framework;
-using OpenSim.Region;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
{
public interface IScript
{
@@ -54,7 +54,7 @@ namespace OpenSim.Scripting
public void Initialise(ScriptInfo scriptInfo)
{
script = scriptInfo;
- script.events.OnFrame += new OpenSim.Region.Scenes.EventManager.OnFrameDelegate(events_OnFrame);
+ script.events.OnFrame += new OpenSim.Region.Environment.Scenes.EventManager.OnFrameDelegate(events_OnFrame);
script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence);
}
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
similarity index 93%
rename from OpenSim/OpenSim.Region/Scenes/scripting/ScriptInfo.cs
rename to OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
index cf627dd32a..522a572736 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptInfo.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -29,10 +29,10 @@ using System;
using System.Collections.Generic;
using System.Text;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Console;
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
{
///
/// Class which provides access to the world
diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
similarity index 90%
rename from OpenSim/OpenSim.Region/Scenes/scripting/ScriptManager.cs
rename to OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index abffffa1fa..eb1c1d9ce4 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -29,12 +29,12 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
{
public class ScriptManager
{
List scripts = new List();
- OpenSim.Region.Scenes.Scene scene;
+ OpenSim.Region.Environment.Scenes.Scene scene;
Dictionary compilers = new Dictionary();
private void LoadFromCompiler(Dictionary compiledscripts)
@@ -49,7 +49,7 @@ namespace OpenSim.Scripting
OpenSim.Framework.Console.MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");
}
- public ScriptManager(OpenSim.Region.Scenes.Scene world)
+ public ScriptManager(OpenSim.Region.Environment.Scenes.Scene world)
{
scene = world;
@@ -59,9 +59,6 @@ namespace OpenSim.Scripting
JScriptEngine jscriptCompiler = new JScriptEngine();
compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);
-
- JSharpScriptEngine jsharpCompiler = new JSharpScriptEngine();
- compilers.Add(jsharpCompiler.FileExt(), jsharpCompiler);
}
public void Compile(string filename)
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
similarity index 85%
rename from OpenSim/Examples/SimpleApp/MyWorld.cs
rename to OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 01e0c59356..89f39d3b48 100644
--- a/OpenSim/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -5,20 +5,20 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
using libsecondlife;
-using OpenSim.Region;
-using Avatar=OpenSim.Region.Scenes.ScenePresence;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment;
+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
+using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework;
-using OpenSim.Caches;
-using OpenGrid.Framework.Communications;
-using OpenSim.Servers;
+using OpenSim.Region.Caches;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers;
namespace SimpleApp
{
public class MyWorld : Scene
{
private RegionInfo m_regionInfo;
- private List m_avatars;
+ private List m_avatars;
public MyWorld(Dictionary clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
: base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
@@ -76,7 +76,7 @@ namespace SimpleApp
client.SendRegionHandshake(m_regionInfo);
- OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
+ OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
}
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
similarity index 92%
rename from OpenSim/Examples/SimpleApp/Program.cs
rename to OpenSim/Region/Examples/SimpleApp/Program.cs
index e1465d198c..4060d68beb 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -2,17 +2,18 @@ using System;
using System.Collections.Generic;
using System.Text;
using OpenSim;
-using OpenSim.GridInterfaces.Local;
+using OpenSim.Region.GridInterfaces.Local;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
+using OpenSim.Framework.Servers;
using OpenSim.Assets;
using libsecondlife;
-using OpenSim.Servers;
using OpenSim.Framework;
-using OpenSim.Caches;
-using OpenGrid.Framework.Communications;
-using OpenSim.LocalCommunications;
+using OpenSim.Region.Caches;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Communications.Local;
+using OpenSim.Region.ClientStack;
namespace SimpleApp
{
diff --git a/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs
rename to OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
similarity index 67%
rename from OpenSim/Examples/SimpleApp/SimpleApp.csproj
rename to OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 00af44a2b2..0a82172e5c 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\..\bin\libsecondlife.dll
+ ..\..\..\..\bin\libsecondlife.dll
False
@@ -67,72 +67,70 @@
False
- ..\..\..\bin\System.Data.dll
+ ..\..\..\..\bin\System.Data.dll
False
System.Xml.dll
False
+
+ ..\..\..\..\bin\XMLRPC.dll
+ False
+
-
- OpenGrid.Framework.Communications
- {683344D5-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Caches
- {1938EB12-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
+ OpenSim.Framework.Communications
+ {CB52B7E7-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.GridInterfaces.Local
- {546099CD-0000-0000-0000-000000000000}
+
+ OpenSim.Framework.Servers
+ {2CC71860-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.LocalCommunications
- {79CED992-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Caches
+ {61FCCDB3-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Region
- {196916AF-0000-0000-0000-000000000000}
+
+ OpenSim.Region.ClientStack
+ {DC3698B2-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.RegionServer
- {632E1BFD-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Communications.Local
+ {BFB5D807-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- OpenSim.Servers
- {8BB20F0A-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Environment
+ {DCBA491C-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- XMLRPC
- {8E81D43C-0000-0000-0000-000000000000}
+
+ OpenSim.Region.GridInterfaces.Local
+ {241A8CDD-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
similarity index 55%
rename from OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
rename to OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index 60c0f85e90..f8896fa8ee 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -1,5 +1,5 @@
-
+
@@ -8,11 +8,11 @@
-
+
-
-
+
+
@@ -20,23 +20,25 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs b/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
rename to OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
similarity index 96%
rename from OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
rename to OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
index 87eff499ea..95d03f1866 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -38,7 +38,7 @@ using libsecondlife;
using Db4objects.Db4o;
using Db4objects.Db4o.Query;
-namespace OpenSim.GridInterfaces.Local
+namespace OpenSim.Region.GridInterfaces.Local
{
public class LocalAssetPlugin : IAssetPlugin
{
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj
similarity index 83%
rename from OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
rename to OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj
index 77c76e3a9d..484a2057e2 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
+++ b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {546099CD-0000-0000-0000-000000000000}
+ {241A8CDD-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.GridInterfaces.Local
+ OpenSim.Region.GridInterfaces.Local
JScript
Grid
IE50
false
Library
- OpenSim.GridInterfaces.Local
+ OpenSim.Region.GridInterfaces.Local
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -59,11 +59,11 @@
- ..\..\..\bin\Db4objects.Db4o.dll
+ ..\..\..\..\bin\Db4objects.Db4o.dll
False
- ..\..\..\bin\libsecondlife.dll
+ ..\..\..\..\bin\libsecondlife.dll
False
@@ -76,13 +76,13 @@
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
diff --git a/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build
new file mode 100644
index 0000000000..4770e6d00f
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
rename to OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj
similarity index 79%
rename from OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
rename to OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj
index 0a918bd0e4..793fde2570 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
+++ b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {B55C0B5D-0000-0000-0000-000000000000}
+ {98C7B681-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.GridInterfaces.Remote
+ OpenSim.Region.GridInterfaces.Remote
JScript
Grid
IE50
false
Library
- OpenSim.GridInterfaces.Remote
+ OpenSim.Region.GridInterfaces.Remote
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\..\bin\libsecondlife.dll
+ ..\..\..\..\bin\libsecondlife.dll
False
@@ -70,26 +70,24 @@
System.Xml.dll
False
+
+ ..\..\..\..\bin\XMLRPC.dll
+ False
+
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
- XMLRPC
- {8E81D43C-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
diff --git a/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build
new file mode 100644
index 0000000000..0bf1b86414
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
similarity index 96%
rename from OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
rename to OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
index ca01c68840..4652f70697 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
-namespace OpenSim.GridInterfaces.Remote
+namespace OpenSim.Region.GridInterfaces.Remote
{
public class RemoteAssetServer : IAssetServer
{
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
rename to OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
similarity index 95%
rename from OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
rename to OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index 341ffbb8a0..dcb8f3bfe7 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using OpenSim.Physics.Manager;
-namespace OpenSim.Physics.BasicPhysicsPlugin
+namespace OpenSim.Region.Physics.BasicPhysicsPlugin
{
///
/// Will be the PhysX plugin but for now will be a very basic physics engine
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj
similarity index 82%
rename from OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
rename to OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj
index f88eb3214e..7dad533cea 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {4F874463-0000-0000-0000-000000000000}
+ {15B4FEF3-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.Physics.BasicPhysicsPlugin
+ OpenSim.Region.Physics.BasicPhysicsPlugin
JScript
Grid
IE50
false
Library
- OpenSim.Physics.BasicPhysicsPlugin
+ OpenSim.Region.Physics.BasicPhysicsPlugin
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\Physics\
+ ..\..\..\..\bin\Physics\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\Physics\
+ ..\..\..\..\bin\Physics\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\..\bin\Axiom.MathLib.dll
+ ..\..\..\..\bin\Axiom.MathLib.dll
False
@@ -68,9 +68,9 @@
-
- OpenSim.Physics.Manager
- {8BE16150-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Physics.Manager
+ {F4FF31EB-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build
similarity index 75%
rename from OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
rename to OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build
index 00ca3f907b..6cf26ca1aa 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -19,14 +19,14 @@
-
-
+
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/OpenSim.Physics/Manager/AssemblyInfo.cs
rename to OpenSim/Region/Physics/Manager/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
similarity index 85%
rename from OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
rename to OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
index 347a6495af..f34040080f 100644
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {8BE16150-0000-0000-0000-000000000000}
+ {F4FF31EB-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.Physics.Manager
+ OpenSim.Region.Physics.Manager
JScript
Grid
IE50
false
Library
- OpenSim.Physics.Manager
+ OpenSim.Region.Physics.Manager
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\..\bin\Axiom.MathLib.dll
+ ..\..\..\..\bin\Axiom.MathLib.dll
False
@@ -72,13 +72,13 @@
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build
similarity index 76%
rename from OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
rename to OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build
index fc3e1e6040..4b7ce81e5d 100644
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -22,16 +22,16 @@
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
similarity index 100%
rename from OpenSim/OpenSim.Physics/Manager/PhysicsActor.cs
rename to OpenSim/Region/Physics/Manager/PhysicsActor.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
similarity index 100%
rename from OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
rename to OpenSim/Region/Physics/Manager/PhysicsManager.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
similarity index 100%
rename from OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs
rename to OpenSim/Region/Physics/Manager/PhysicsScene.cs
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
similarity index 100%
rename from OpenSim/OpenSim.Physics/Manager/PhysicsVector.cs
rename to OpenSim/Region/Physics/Manager/PhysicsVector.cs
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
rename to OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
similarity index 96%
rename from OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
rename to OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 5233042c9a..8aca851a86 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
using OpenSim.Physics.Manager;
using Ode.NET;
-namespace OpenSim.Physics.OdePlugin
+namespace OpenSim.Region.Physics.OdePlugin
{
///
/// ODE plugin
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj
similarity index 81%
rename from OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
rename to OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj
index 08f54aa994..490c681895 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {63A05FE9-0000-0000-0000-000000000000}
+ {90620634-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.Physics.OdePlugin
+ OpenSim.Region.Physics.OdePlugin
JScript
Grid
IE50
false
Library
- OpenSim.Physics.OdePlugin
+ OpenSim.Region.Physics.OdePlugin
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\Physics\
+ ..\..\..\..\bin\Physics\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\Physics\
+ ..\..\..\..\bin\Physics\
False
False
False
@@ -59,11 +59,11 @@
- ..\..\..\bin\Axiom.MathLib.dll
+ ..\..\..\..\bin\Axiom.MathLib.dll
False
- ..\..\..\bin\Ode.NET.dll
+ ..\..\..\..\bin\Ode.NET.dll
False
@@ -72,9 +72,9 @@
-
- OpenSim.Physics.Manager
- {8BE16150-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Physics.Manager
+ {F4FF31EB-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build
similarity index 73%
rename from OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
rename to OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build
index c93c0c268e..07b9386497 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -19,15 +19,15 @@
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
rename to OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
similarity index 81%
rename from OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
rename to OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
index aa89cc1268..77da9080af 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {988F0AC4-0000-0000-0000-000000000000}
+ {A6D191D8-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.Physics.PhysXPlugin
+ OpenSim.Region.Physics.PhysXPlugin
JScript
Grid
IE50
false
Library
- OpenSim.Physics.PhysXPlugin
+ OpenSim.Region.Physics.PhysXPlugin
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\Physics\
+ ..\..\..\..\bin\Physics\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\Physics\
+ ..\..\..\..\bin\Physics\
False
False
False
@@ -59,11 +59,11 @@
- ..\..\..\bin\Axiom.MathLib.dll
+ ..\..\..\..\bin\Axiom.MathLib.dll
False
- ..\..\..\bin\PhysX_Wrapper_Dotnet.dll
+ ..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll
False
@@ -72,9 +72,9 @@
-
- OpenSim.Physics.Manager
- {8BE16150-0000-0000-0000-000000000000}
+
+ OpenSim.Region.Physics.Manager
+ {F4FF31EB-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
similarity index 73%
rename from OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
rename to OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
index be7a84733a..c1a960825b 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -19,15 +19,15 @@
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
similarity index 94%
rename from OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
rename to OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 200b232a8e..8bf794ba92 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
using OpenSim.Physics.Manager;
using PhysXWrapper;
-namespace OpenSim.Physics.PhysXPlugin
+namespace OpenSim.Region.Physics.PhysXPlugin
{
///
/// Will be the PhysX plugin but for now will be a very basic physics engine
diff --git a/libraries/libTerrain/libTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Scripting/Properties/AssemblyInfo.cs
similarity index 86%
rename from libraries/libTerrain/libTerrain/Properties/AssemblyInfo.cs
rename to OpenSim/Region/Scripting/Properties/AssemblyInfo.cs
index d47f359959..f5da4c08ce 100644
--- a/libraries/libTerrain/libTerrain/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Scripting/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("libTerrain")]
+[assembly: AssemblyTitle("OpenSim.Scripting")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("libTerrain")]
+[assembly: AssemblyProduct("OpenSim.Scripting")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("69f89dd2-fbd1-400e-bb0d-ac73b80853de")]
+[assembly: Guid("61eae1ad-82aa-4c77-8bc5-b5a8c9522b18")]
// Version information for an assembly consists of the following four values:
//
diff --git a/OpenSim/Region/Scripting/Script.cs b/OpenSim/Region/Scripting/Script.cs
new file mode 100644
index 0000000000..0f4af00f63
--- /dev/null
+++ b/OpenSim/Region/Scripting/Script.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Framework.Console;
+using OpenSim.Framework;
+using OpenSim.Region;
+using OpenSim.Region.Scenes;
+
+namespace OpenSim.Scripting
+{
+ public interface IScript
+ {
+ void Initialise(ScriptInfo scriptInfo);
+ }
+
+ public class TestScript : IScript
+ {
+ ScriptInfo script;
+
+ public void Initialise(ScriptInfo scriptInfo)
+ {
+ script = scriptInfo;
+ script.events.OnFrame += new OpenSim.Region.Scenes.EventManager.OnFrameDelegate(events_OnFrame);
+ }
+
+ void events_OnFrame()
+ {
+ script.logger.Verbose("Hello World!");
+ }
+ }
+}
diff --git a/OpenSim/Region/Scripting/ScriptAccess.cs b/OpenSim/Region/Scripting/ScriptAccess.cs
new file mode 100644
index 0000000000..a9fede5739
--- /dev/null
+++ b/OpenSim/Region/Scripting/ScriptAccess.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Region.Scenes;
+using OpenSim.Framework.Console;
+
+namespace OpenSim.Scripting
+{
+ ///
+ /// Class which provides access to the world
+ ///
+ public class ScriptInfo
+ {
+ // Reference to world.eventsManager provided for convenience
+ public EventManager events;
+
+ // The main world
+ public Scene world;
+
+ // The console
+ public LogBase logger;
+
+ public ScriptInfo(Scene scene)
+ {
+ world = scene;
+ events = world.eventManager;
+ logger = OpenSim.Framework.Console.MainLog.Instance;
+ }
+ }
+}
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
similarity index 95%
rename from OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
rename to OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index ab3c34c412..3bc6f25df0 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
@@ -39,7 +39,7 @@ using BerkeleyDb;
using Kds.Serialization;
using Kds.Serialization.Buffer;
-namespace OpenSim.Storage.LocalStorageBDB
+namespace OpenSim.Region.Storage.LocalStorageBDB
{
public class BDBLocalStorage : ILocalStorage
{
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj
similarity index 82%
rename from OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
rename to OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj
index 417643f23b..b956c9b721 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {EE9E5D96-0000-0000-0000-000000000000}
+ {A4691E59-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.Storage.LocalStorageBerkeleyDB
+ OpenSim.Region.Storage.LocalStorageBerkeleyDB
JScript
Grid
IE50
false
Library
- OpenSim.Storage.LocalStorageBerkeleyDB
+ OpenSim.Region.Storage.LocalStorageBerkeleyDB
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -59,15 +59,15 @@
- ..\..\..\bin\Kds.Serialization.dll
+ ..\..\..\..\bin\Kds.Serialization.dll
False
- ..\..\..\bin\libdb_dotNET43.dll
+ ..\..\..\..\bin\libdb_dotNET43.dll
False
- ..\..\..\bin\libsecondlife.dll
+ ..\..\..\..\bin\libsecondlife.dll
False
@@ -84,13 +84,13 @@
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build
new file mode 100644
index 0000000000..20f5171ef1
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
similarity index 100%
rename from OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
rename to OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
rename to OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
similarity index 97%
rename from OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
rename to OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 8e6b04d66d..5cb4861f60 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
{
///
///
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
similarity index 95%
rename from OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
rename to OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
index 56387ac158..22f3392379 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
{
public class MapStorage
{
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
similarity index 84%
rename from OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
rename to OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 5b8f1c1c7a..147158c6b8 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {E1B79ECF-0000-0000-0000-000000000000}
+ {43DB702D-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.Storage.LocalStorageDb4o
+ OpenSim.Region.Storage.LocalStorageDb4o
JScript
Grid
IE50
false
Library
- OpenSim.Storage.LocalStorageDb4o
+ OpenSim.Region.Storage.LocalStorageDb4o
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -59,11 +59,11 @@
- ..\..\..\bin\Db4objects.Db4o.dll
+ ..\..\..\..\bin\Db4objects.Db4o.dll
False
- ..\..\..\bin\libsecondlife.dll
+ ..\..\..\..\bin\libsecondlife.dll
False
@@ -76,13 +76,13 @@
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
similarity index 73%
rename from OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
rename to OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index 739b98c2df..fc9f055b47 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -22,17 +22,17 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
similarity index 95%
rename from OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs
rename to OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
index d24fb5f770..dcbe639e2a 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
@@ -34,7 +34,7 @@ using libsecondlife;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
{
public class UUIDParcelQuery : Predicate
{
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
similarity index 95%
rename from OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs
rename to OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
index b2e8a91a02..23de6dd400 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
@@ -34,7 +34,7 @@ using libsecondlife;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
{
public class UUIDPrimQuery : Predicate
{
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj
similarity index 84%
rename from OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
rename to OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj
index ff93a8f4c7..d1353a587b 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {6B20B603-0000-0000-0000-000000000000}
+ {477B9270-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.Storage.LocalStorageSQLite
+ OpenSim.Region.Storage.LocalStorageSQLite
JScript
Grid
IE50
false
Library
- OpenSim.Storage.LocalStorageSQLite
+ OpenSim.Region.Storage.LocalStorageSQLite
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\..\bin\
+ ..\..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\..\bin\libsecondlife.dll
+ ..\..\..\..\bin\libsecondlife.dll
False
@@ -71,7 +71,7 @@
False
- ..\..\..\bin\System.Data.SQLite.dll
+ ..\..\..\..\bin\System.Data.SQLite.dll
False
@@ -80,13 +80,13 @@
-
+
OpenSim.Framework
{8ACA2445-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
OpenSim.Framework.Console
{A7CD0630-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build
similarity index 70%
rename from Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
rename to OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build
index d82d751737..9d12c33437 100644
--- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,12 +8,10 @@
-
+
-
-
-
+
@@ -21,17 +19,18 @@
-
-
-
+
+
+
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
similarity index 100%
rename from OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
rename to OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
similarity index 93%
rename from OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
rename to OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
index b45debf9a2..80158d560d 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Storage.LocalStorageSQLite")]
+[assembly: AssemblyTitle("OpenSim.Region.Storage.LocalStorageSQLite")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Storage.LocalStorageSQLite")]
+[assembly: AssemblyProduct("OpenSim.Region.Storage.LocalStorageSQLite")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
similarity index 96%
rename from OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
rename to OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 8a7893e12b..b407be4593 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -37,7 +37,7 @@ using libsecondlife;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-namespace OpenSim.Storage.LocalStorageSQLite
+namespace OpenSim.Region.Storage.LocalStorageSQLite
{
public class SQLiteLocalStorage : ILocalStorage
{
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
similarity index 87%
rename from OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
rename to OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
index 0469efe5fe..24667e5b8c 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
@@ -3,20 +3,20 @@
Local
8.0.50727
2.0
- {2270B8FE-0000-0000-0000-000000000000}
+ {C9E0F891-0000-0000-0000-000000000000}
Debug
AnyCPU
- OpenSim.Terrain.BasicTerrain
+ OpenSim.Region.Terrain.BasicTerrain
JScript
Grid
IE50
false
Library
- OpenSim.Terrain.BasicTerrain
+ OpenSim.Region.Terrain.BasicTerrain
@@ -32,7 +32,7 @@
True
4096
False
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -50,7 +50,7 @@
False
4096
True
- ..\..\bin\
+ ..\..\..\bin\
False
False
False
@@ -59,7 +59,7 @@
- ..\..\bin\libTerrain-BSD.dll
+ ..\..\..\bin\libTerrain-BSD.dll
False
@@ -67,7 +67,7 @@
False
- ..\..\bin\openjpegnet.dll
+ ..\..\..\bin\openjpegnet.dll
False
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build
similarity index 80%
rename from OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
rename to OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build
index 91dd6f5f63..dc7203a0be 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -20,18 +20,18 @@
-
+
-
+
-
-
-
+
+
+
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
similarity index 93%
rename from OpenSim/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
rename to OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
index 827c68fbf2..7d10ae332b 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Terrain.BasicTerrain")]
+[assembly: AssemblyTitle("OpenSim.Region.Terrain.BasicTerrain")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Terrain.BasicTerrain")]
+[assembly: AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
similarity index 97%
rename from OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
rename to OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 4f989fa39c..c2d7e8624c 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -32,7 +32,7 @@ using System.Drawing;
using libTerrain;
using OpenJPEGNet;
-namespace OpenSim.Terrain
+namespace OpenSim.Region.Terrain
{
public class TerrainCommand
{
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
similarity index 96%
rename from OpenSim/OpenSim.Terrain.BasicTerrain/TerrainFilter.cs
rename to OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
index 5baf87fcc9..e0ae586244 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainFilter.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
@@ -36,7 +36,7 @@ using Microsoft.JScript;
using libTerrain;
-namespace OpenSim.Terrain
+namespace OpenSim.Region.Terrain
{
public interface ITerrainFilter
{
diff --git a/bin/DotSets.dll b/bin/DotSets.dll
new file mode 100644
index 0000000000..5225651409
Binary files /dev/null and b/bin/DotSets.dll differ
diff --git a/bin/Mono.PEToolkit.dll b/bin/Mono.PEToolkit.dll
new file mode 100644
index 0000000000..b4c3e70e67
Binary files /dev/null and b/bin/Mono.PEToolkit.dll differ
diff --git a/bin/XMLRPC.dll b/bin/XMLRPC.dll
new file mode 100644
index 0000000000..adf7297518
Binary files /dev/null and b/bin/XMLRPC.dll differ
diff --git a/bin/libsecondlife.dll b/bin/libsecondlife.dll
index 364d8fb718..1715011a3c 100644
Binary files a/bin/libsecondlife.dll and b/bin/libsecondlife.dll differ
diff --git a/libraries/libLSL/Properties/AssemblyInfo.cs b/libraries/libLSL/Properties/AssemblyInfo.cs
deleted file mode 100644
index 205dd955e8..0000000000
--- a/libraries/libLSL/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("libLSL")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("libLSL")]
-[assembly: AssemblyCopyright("Copyright © 2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("65895724-efca-49f8-8efc-211594b4c716")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/libraries/libLSL/libLSL.csproj b/libraries/libLSL/libLSL.csproj
deleted file mode 100644
index fe8822b4bd..0000000000
--- a/libraries/libLSL/libLSL.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
- Debug
- AnyCPU
- 8.0.50727
- 2.0
- {E213BD9C-85C9-4739-B613-E1B58543370C}
- Library
- Properties
- libLSL
- libLSL
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/libraries/libLSL/lsl.cs b/libraries/libLSL/lsl.cs
deleted file mode 100644
index 37a6429ed7..0000000000
--- a/libraries/libLSL/lsl.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libLSL
-{
-
-
- enum lslVarType : byte
- {
- VARTYPE_VOID = 0,
- VARTYPE_INTEGER = 1,
- VARTYPE_FLOAT = 2,
- VARTYPE_STRING = 3,
- VARTYPE_KEY = 4,
- VARTYPE_VECTOR = 5,
- VARTYPE_ROTATION = 6,
- VARTYPE_LIST = 7
- }
-
- enum lslEventType : byte
- {
- EVENT_STATE_ENTRY = 0,
- EVENT_STATE_EXIT = 1,
- EVENT_TOUCH_START = 2,
- EVENT_TOUCH = 3,
- EVENT_TOUCH_END = 4,
- EVENT_COLLISION_START = 5,
- EVENT_COLLISION = 6,
- EVENT_COLLISION_END = 7,
- EVENT_LAND_COLLISION_START = 8,
- EVENT_LAND_COLLISION = 9,
- EVENT_LAND_COLLISION_END = 10,
- EVENT_TIMER = 11,
- EVENT_LISTEN = 12,
- EVENT_ON_REZ = 13,
- EVENT_SENSOR = 14,
- EVENT_NO_SENSOR = 15,
- EVENT_CONTROL = 16,
- EVENT_MONEY = 17,
- EVENT_EMAIL = 18,
- EVENT_AT_TARGET = 19,
- EVENT_NOT_AT_TARGET = 20,
- EVENT_AT_ROT_TARGET = 21,
- EVENT_NOT_AT_ROT_TARGET = 22,
- EVENT_RUN_TIME_PERMISSIONS = 23,
- EVENT_CHANGED = 24,
- EVENT_ATTACH = 25,
- EVENT_DATASERVER = 26,
- EVENT_LINK_MESSAGE = 27,
- EVENT_MOVING_START = 28,
- EVENT_MOVING_END = 29,
- EVENT_OBJECT_REZ = 30,
- EVENT_REMOTE_DATA = 31,
- EVENT_HTTP_RESPONSE = 32
- }
-
- enum lslOpcodes : byte
- {
- // No Operation
- OP_NOOP = 0x00,
-
- // Pops
- OP_POP = 0x01,
- OP_POPS = 0x02,
- OP_POPL = 0x03,
- OP_POPV = 0x04,
- OP_POPQ = 0x05,
- OP_POPARG = 0x06,
- OP_POPIP = 0x07,
- OP_POPBP = 0x08,
- OP_POPSP = 0x09,
- OP_POPSLR = 0x0A,
-
- // Dupes
- OP_DUP = 0x20,
- OP_DUPS = 0x21,
- OP_DUPL = 0x22,
- OP_DUPV = 0x23,
- OP_DUPQ = 0x24,
-
- // Stores
- OP_STORE = 0x30,
- OP_STORES = 0x31,
- OP_STOREL = 0x32,
- OP_STOREV = 0x33,
- OP_STOREQ = 0x34,
- OP_STOREG = 0x35,
- OP_STOREGS = 0x36,
- OP_STOREGL = 0x37,
- OP_STOREGV = 0x38,
- OP_STOREGQ = 0x39,
-
- // Loads
- OP_LOADP = 0x3A,
- OP_LOADSP = 0x3B,
- OP_LOADLP = 0x3C,
- OP_LOADVP = 0x3D,
- OP_LOADQP = 0x3E,
- OP_LOADGP = 0x3F,
- OP_LOADGSP = 0x40,
- OP_LOADGLP = 0x41,
- OP_LOADGVP = 0x42,
- OP_LOADGQP = 0x43,
-
- // Pushes
- OP_PUSH = 0x50,
- OP_PUSHS = 0x51,
- OP_PUSHL = 0x52,
- OP_PUSHV = 0x53,
- OP_PUSHQ = 0x54,
- OP_PUSHG = 0x55,
- OP_PUSHGS = 0x56,
- OP_PUSHGL = 0x57,
- OP_PUSHGV = 0x58,
- OP_PUSHGQ = 0x59,
- OP_PUSHIP = 0x5A,
- OP_PUSHBP = 0x5B,
- OP_PUSHSP = 0x5C,
- OP_PUSHARGB = 0x5D,
- OP_PUSHARGI = 0x5E,
- OP_PUSHARGF = 0x5F,
- OP_PUSHARGS = 0x60,
- OP_PUSHARGV = 0x61,
- OP_PUSHARGQ = 0x62,
- OP_PUSHE = 0x63,
- OP_PUSHEV = 0x64,
- OP_PUSHEQ = 0x65,
- OP_PUSHARGE = 0x66,
-
- // Numerics
- OP_ADD = 0x70,
- OP_SUB = 0x71,
- OP_MUL = 0x72,
- OP_DIV = 0x73,
- OP_MOD = 0x74,
- OP_EQ = 0x75,
- OP_NEQ = 0x76,
- OP_LEQ = 0x77,
- OP_GEQ = 0x78,
- OP_LESS = 0x79,
- OP_GREATER = 0x7A,
- OP_BITAND = 0x7B,
- OP_BITOR = 0x7C,
- OP_BITXOR = 0x7D,
- OP_BOOLAND = 0x7E,
- OP_BOOLOR = 0x7F,
- OP_NEG = 0x80,
- OP_BITNOT = 0x81,
- OP_BOOLNOT = 0x82,
-
- // Sequence
- OP_JUMP = 0x90,
- OP_JUMPIF = 0x91,
- OP_JUMPNIF = 0x92,
- OP_STATE = 0x93,
- OP_CALL = 0x94,
- OP_RETURN = 0x95,
-
- // Cast
- OP_CAST = 0xA0,
-
- // Stack
- OP_STACKTOS = 0xB0,
- OP_STACKTOL = 0xB1,
-
- // Debug
- OP_PRINT = 0xC0,
-
- // Library
- OP_CALLLIB = 0xD0,
- OP_CALLLIB_TWO_BYTE = 0xD1,
-
- // More Numerics
- OP_SHL = 0xE0,
- OP_SHR = 0xE1
- }
-
- class lslHeader
- {
- int TM; // Top of memory
- int IP; // Instruction pointer
- int VN; // Version Number (0x00000200)
- int BP; // Base Pointer
- int SP; // Stack Pointer
- int HR; // Heap Register
- int HP; // Heap Pointer
- int CS; // Current State
- int NS; // Next State
- int CE; // Current Events (Which events need running still?)
- int IE; // In Event
- int ER; // Event Register
- int FR; // Fault Register
- int SLR; // Sleep Register
- int GVR; // Global Variable Register (Pointer)
- int GFR; // Global Function Register (Pointer)
- int PR; // Parameter Register - OnRez Int?
- int ESR; // Energy Supply Register
- int SR; // State Register
- long NCE; // Extended Current Events
- long NIE; // Extended In Event
- long NER; // Extended Event Register
-
- public void readFromBytes(byte[] data)
- {
-
- }
- }
-
- class lslStaticBlock
- {
- int length; // Length (bytes)
- lslVarType varType;// Variable Type
- byte unknown; // Unknown
- Object varObject; // Variable Object
-
- public void readFromBytes(byte[] data)
- {
-
- }
-
- }
-
- class lslHeapBlock
- {
- int length;
- lslVarType varType;
- short referenceCount;
- Object varObject;
-
- public void readFromBytes(byte[] data)
- {
-
- }
- }
-
- class lslStatePointer
- {
- int location;
- long eventMask;
-
- public void readFromBytes(byte[] data)
- {
-
- }
- }
-
- class lslStateFrameBlock
- {
- int number;
- lslStatePointer[] pointers;
-
- public void readFromBytes(byte[] data)
- {
-
- }
- }
-
- class lslStateBlockElement
- {
- int pointerToCode;
- int callFrameSize;
-
- public void readFromBytes(byte[] data)
- {
-
- }
- }
-
- class lslStateBlock
- {
- int length;
- byte unknown;
-
- lslStateBlockElement[] handlers; // ?
-
- public void readFromBytes(byte[] data)
- {
-
- }
- }
-
- class lslFunctioBlock
- {
- int number;
- int[] pointers; // Relative to this -> codechunk
-
- public void readFromBytes(byte[] data)
- {
-
- }
- }
-
- class lslCodeArgument
- {
- lslVarType type;
- byte empty;
-
- public void readFromBytes(byte[] data)
- {
-
- }
- }
-
- class lslCodeChunkHeader
- {
- int length;
- string comment;
- lslVarType returnType;
- lslCodeArgument[] arguments;
- byte empty;
-
- public void readFromBytes(byte[] data)
- {
-
- }
- }
-
- class lslCodeChunk
- {
- lslCodeChunkHeader header;
- lslByteCode bytecode;
-
- public void readFromBytes(byte[] data)
- {
-
- }
- }
-}
diff --git a/libraries/libLSL/lslByteCode.cs b/libraries/libLSL/lslByteCode.cs
deleted file mode 100644
index 4dffe22451..0000000000
--- a/libraries/libLSL/lslByteCode.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libLSL
-{
- class lslByteCode
- {
- byte[] bytecode;
-
- public void executeStep()
- {
- byte ins = nextInstruction();
- lslOpcodes code = (lslOpcodes)ins;
-
- Object arg1 = (Object)32;
- Object arg2 = (Object)32;
-
- switch (code)
- {
- case lslOpcodes.OP_NOOP:
- break;
-
- case lslOpcodes.OP_POP:
- popBytes(4);
- break;
-
- case lslOpcodes.OP_POPS:
- case lslOpcodes.OP_POPL:
- // Do Stuff
- break;
-
- case lslOpcodes.OP_POPV:
- popBytes(12);
- break;
- case lslOpcodes.OP_POPQ:
- popBytes(16);
- break;
-
- case lslOpcodes.OP_POPARG:
- popBytes((Int32)arg1);
- break;
-
- case lslOpcodes.OP_POPIP:
- // Do Stuff
- break;
-
- case lslOpcodes.OP_POPBP:
- // Do Stuff
- break;
-
- case lslOpcodes.OP_POPSP:
- // Do Stuff
- break;
-
- case lslOpcodes.OP_POPSLR:
- // Do Stuff
- break;
-
- case lslOpcodes.OP_DUP:
- pushBytes(getBytes(4));
- break;
-
- case lslOpcodes.OP_DUPS:
- case lslOpcodes.OP_DUPL:
- // Do Stuff
- break;
-
- case lslOpcodes.OP_DUPV:
- pushBytes(getBytes(12));
- break;
-
- case lslOpcodes.OP_DUPQ:
- pushBytes(getBytes(16));
- break;
-
- case lslOpcodes.OP_STORE:
- // Somefin.
- break;
-
- default:
- break;
- }
- }
-
- ///
- /// Advance the instruction pointer, pull the current instruction
- ///
- ///
- byte nextInstruction()
- {
- return 0;
- }
-
- ///
- /// Removes bytes from the stack
- ///
- /// Number of bytes
- void popBytes(int num)
- {
-
- }
-
- ///
- /// Pushes Bytes to the stack
- ///
- /// Ze bytes!
- void pushBytes(byte[] bytes)
- {
-
- }
-
- ///
- /// Get Bytes from the stack
- ///
- /// Number of bytes
- /// Ze bytes!
- byte[] getBytes(int num)
- {
- return new byte[1];
- }
-
- ///
- /// Saves bytes to the local frame
- ///
- /// Ze bytes!
- /// Index in local frame
- void storeBytes(byte[] bytes, int index)
- {
-
- }
- }
-}
diff --git a/libraries/libLSL/lslscript.cs b/libraries/libLSL/lslscript.cs
deleted file mode 100644
index d9d57bd07e..0000000000
--- a/libraries/libLSL/lslscript.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libLSL
-{
- public class LSLScript
- {
- }
-}
diff --git a/libraries/libTerrain/libTerrain.sln b/libraries/libTerrain/libTerrain.sln
deleted file mode 100644
index 3ccfe23536..0000000000
--- a/libraries/libTerrain/libTerrain.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libTerrainTests", "libTerrainTests\libTerrainTests.csproj", "{7214C9E2-1390-41BD-BFFC-83FA5931C5CF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libTerrain-BSD", "libTerrain\libTerrain-BSD.csproj", "{EEC06368-30E8-42E8-A23C-2C9D139AD495}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {7214C9E2-1390-41BD-BFFC-83FA5931C5CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7214C9E2-1390-41BD-BFFC-83FA5931C5CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7214C9E2-1390-41BD-BFFC-83FA5931C5CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7214C9E2-1390-41BD-BFFC-83FA5931C5CF}.Release|Any CPU.Build.0 = Release|Any CPU
- {EEC06368-30E8-42E8-A23C-2C9D139AD495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EEC06368-30E8-42E8-A23C-2C9D139AD495}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EEC06368-30E8-42E8-A23C-2C9D139AD495}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EEC06368-30E8-42E8-A23C-2C9D139AD495}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/libraries/libTerrain/libTerrain/Bitmap/Bitmap.cs b/libraries/libTerrain/libTerrain/Bitmap/Bitmap.cs
deleted file mode 100644
index 923da47b86..0000000000
--- a/libraries/libTerrain/libTerrain/Bitmap/Bitmap.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Drawing;
-
-namespace libTerrain
-{
- class Raster
- {
- int w;
- int h;
- Bitmap bmp;
-
- public Raster(int width, int height)
- {
- w = width;
- h = height;
- bmp = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
- }
-
- public Channel toChannel()
- {
- Channel chan = new Channel(bmp.Width, bmp.Height);
-
- int x, y;
- for (x = 0; x < bmp.Width; x++)
- {
- for (y = 0; y < bmp.Height; y++)
- {
- Color val = bmp.GetPixel(x, y);
- chan.map[x, y] = (((double)val.R + (double)val.G + (double)val.B) / 3.0) / 255.0;
- }
- }
-
- return chan;
- }
-
- public void drawText(string txt, string font, double size)
- {
- Graphics gd = Graphics.FromImage(bmp);
- //gd.DrawString(txt,
-
-
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Channel/Channel.cs b/libraries/libTerrain/libTerrain/Channel/Channel.cs
deleted file mode 100644
index 9849ef2f9f..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Channel.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-
-/* Channel
- * A channel is a single heightmap array
- * */
-
-namespace libTerrain
-{
- partial class Channel
- {
- public double[,] map;
- public int w;
- public int h;
-
- public int seed = 1338; // One better than 1337
-
- public Channel()
- {
- w = 256;
- h = 256;
- map = new double[w, h];
- }
-
- public Channel(int width, int height)
- {
- w = width;
- h = height;
- map = new double[w, h];
- }
-
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Channel/Common.cs b/libraries/libTerrain/libTerrain/Channel/Common.cs
deleted file mode 100644
index 438359ce8c..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Common.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- public partial class Channel
- {
- public int getWidth()
- {
- return w;
- }
- public int getHeight()
- {
- return h;
- }
-
- public Channel copy()
- {
- Channel x = new Channel(w, h);
- x.map = (double[,])this.map.Clone();
- return x;
- }
-
- public void set(int x, int y, double val)
- {
- if (x >= w)
- throw new Exception("Bounds error while setting pixel (width)");
- if (y >= h)
- throw new Exception("Bounds error while setting pixel (height)");
- if (x < 0)
- throw new Exception("Bounds error while setting pixel (width)");
- if (y < 0)
- throw new Exception("Bounds error while setting pixel (height)");
-
- map[x, y] = val;
- }
-
- public void setClip(int x, int y, double val)
- {
- if (x >= w)
- throw new Exception("Bounds error while setting pixel (width)");
- if (y >= h)
- throw new Exception("Bounds error while setting pixel (height)");
- if (x < 0)
- throw new Exception("Bounds error while setting pixel (width)");
- if (y < 0)
- throw new Exception("Bounds error while setting pixel (height)");
-
- if (val > 1.0)
- val = 1.0;
- if (val < 0.0)
- val = 0.0;
-
- map[x, y] = val;
- }
-
- private double getBilinearInterpolate(double x, double y)
- {
- if (x > w - 2.0)
- x = w - 2.0;
- if (y > h - 2.0)
- y = h - 2.0;
- if (x < 0.0)
- x = 0.0;
- if (y < 0.0)
- y = 0.0;
-
- int STEP_SIZE = 1;
- double h00 = get((int)x, (int)y);
- double h10 = get((int)x + STEP_SIZE, (int)y);
- double h01 = get((int)x, (int)y + STEP_SIZE);
- double h11 = get((int)x + STEP_SIZE, (int)y + STEP_SIZE);
- double h1 = h00;
- double h2 = h10;
- double h3 = h01;
- double h4 = h11;
- double a00 = h1;
- double a10 = h2 - h1;
- double a01 = h3 - h1;
- double a11 = h1 - h2 - h3 + h4;
- double partialx = x - (int)x;
- double partialz = y - (int)y;
- double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
- return hi;
- }
-
- public double get(int x, int y)
- {
- if (x >= w)
- x = w - 1;
- if (y >= h)
- y = h - 1;
- if (x < 0)
- x = 0;
- if (y < 0)
- y = 0;
- return map[x, y];
- }
-
- public void setWrap(int x, int y, double val)
- {
- map[x % w, y % h] = val;
- }
-
- public void setWrapClip(int x, int y, double val)
- {
- if (val > 1.0)
- val = 1.0;
- if (val < 0.0)
- val = 0.0;
-
- map[x % w, y % h] = val;
- }
-
- public void fill(double val)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = val;
- }
- }
- }
-
- public void fill(double min, double max, double val)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (map[x, y] >= min && map[x, y] <= max)
- map[x, y] = val;
- }
- }
- }
-
- public double findMax()
- {
- int x, y;
- double max = double.MinValue;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (map[x, y] > max)
- max = map[x, y];
- }
- }
-
- return max;
- }
-
- public double findMin()
- {
- int x, y;
- double min = double.MaxValue;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (map[x, y] < min)
- min = map[x, y];
- }
- }
-
- return min;
- }
-
- public double sum()
- {
- int x, y;
- double sum = 0.0;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- sum += map[x, y];
- }
- }
-
- return sum;
- }
-
- public double avg()
- {
- return sum() / (w * h);
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Channel/Editing/Flatten.cs b/libraries/libTerrain/libTerrain/Channel/Editing/Flatten.cs
deleted file mode 100644
index 5e5254d223..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Editing/Flatten.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Flattens the area underneath rx,ry by moving it to the average of the area. Uses a spherical mask provided by the raise() function.
- ///
- /// The X coordinate of the terrain mask
- /// The Y coordinate of the terrain mask
- /// The size of the terrain mask
- /// The scale of the terrain mask
- public void flatten(double rx, double ry, double size, double amount)
- {
- // Generate the mask
- Channel temp = new Channel(w, h);
- temp.fill(0);
- temp.raise(rx, ry, size, amount);
- temp.normalise();
- double total_mod = temp.sum();
-
- // Establish the average height under the area
- Channel newmap = new Channel(w, h);
- newmap.map = (double[,])map.Clone();
-
- newmap *= temp;
-
- double total_terrain = newmap.sum();
- double avg_height = total_terrain / total_mod;
-
- // Create a flat terrain using the average height
- Channel flat = new Channel(w, h);
- flat.fill(avg_height);
-
- // Blend the current terrain with the average height terrain
- // using the "raised" empty terrain as a mask
- blend(flat, temp);
-
- }
-
- public void flatten(Channel mask, double amount)
- {
- // Generate the mask
- Channel temp = mask * amount;
- temp.clip(0, 1); // Cut off out-of-bounds values
-
- double total_mod = temp.sum();
-
- // Establish the average height under the area
- Channel map = new Channel(w, h);
- map.map = (double[,])this.map.Clone();
-
- map *= temp;
-
- double total_terrain = map.sum();
- double avg_height = total_terrain / total_mod;
-
- // Create a flat terrain using the average height
- Channel flat = new Channel(w, h);
- flat.fill(avg_height);
-
- // Blend the current terrain with the average height terrain
- // using the "raised" empty terrain as a mask
- blend(flat, temp);
- }
- }
-}
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/Editing/Raise.cs b/libraries/libTerrain/libTerrain/Channel/Editing/Raise.cs
deleted file mode 100644
index ce1ce98eb7..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Editing/Raise.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Raises land around the selection
- ///
- /// The center the X coordinate of where you wish to raise the land
- /// The center the Y coordinate of where you wish to raise the land
- /// The radius of the dimple
- /// How much impact to add to the terrain (0..2 usually)
- public void raise(double rx, double ry, double size, double amount)
- {
- raiseSphere(rx, ry, size, amount);
- }
-
- ///
- /// Raises land in a sphere around the selection
- ///
- /// The center the X coordinate of where you wish to raise the land
- /// The center the Y coordinate of where you wish to raise the land
- /// The radius of the sphere dimple
- /// How much impact to add to the terrain (0..2 usually)
- public void raiseSphere(double rx, double ry, double size, double amount)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double z = size;
- z *= z;
- z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
-
- if (z < 0)
- z = 0;
-
- map[x, y] += z * amount;
- }
- }
- }
-
- ///
- /// Lowers land in a sphere around the selection
- ///
- /// The center the X coordinate of where you wish to lower the land
- /// The center the Y coordinate of where you wish to lower the land
- /// The radius of the sphere dimple
- /// How much impact to remove from the terrain (0..2 usually)
- public void lower(double rx, double ry, double size, double amount)
- {
- lowerSphere(rx, ry, size, amount);
- }
-
- ///
- /// Lowers land in a sphere around the selection
- ///
- /// The center the X coordinate of where you wish to lower the land
- /// The center the Y coordinate of where you wish to lower the land
- /// The radius of the sphere dimple
- /// How much impact to remove from the terrain (0..2 usually)
- public void lowerSphere(double rx, double ry, double size, double amount)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double z = size;
- z *= z;
- z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
-
- if (z < 0)
- z = 0;
-
- map[x, y] -= z * amount;
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/File.cs b/libraries/libTerrain/libTerrain/Channel/File.cs
deleted file mode 100644
index 4163a5fbe9..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/File.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Drawing;
-
-namespace libTerrain
-{
- partial class Channel
- {
- public Channel loadImage(string filename)
- {
- Bitmap bit = new Bitmap(filename);
- Channel chan = new Channel(bit.Width, bit.Height);
-
- int x, y;
- for (x = 0; x < bit.Width; x++)
- {
- for (y = 0; y < bit.Height; y++)
- {
- Color val = bit.GetPixel(x, y);
- chan.map[x, y] = (((double)val.R + (double)val.G + (double)val.B) / 3.0) / 255.0;
- }
- }
-
- return chan;
- }
-
- public void saveImage(string filename)
- {
- Bitmap bit = new Bitmap(w, h, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- int val = Math.Min(255, (int)(map[x,y] * 255));
- Color col = Color.FromArgb(val,val,val);
- bit.SetPixel(x, y, col);
- }
- }
- bit.Save(filename);
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Channel/Generators/Cellular.cs b/libraries/libTerrain/libTerrain/Channel/Generators/Cellular.cs
deleted file mode 100644
index 0cec05d3dd..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Generators/Cellular.cs
+++ /dev/null
@@ -1 +0,0 @@
-/* Needs BSD rewrite */
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/Generators/Fracture.cs b/libraries/libTerrain/libTerrain/Channel/Generators/Fracture.cs
deleted file mode 100644
index 2a24ecf14a..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Generators/Fracture.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Produces a set of coordinates defined by an edge point. Eg - 0 = 0,0. 256 = 0,256. 512 = 256,256
- /// Assumes a 256^2 heightmap. This needs fixing for input values of w,h
- ///
- ///
- ///
- ///
- ///
- private int[] radialEdge256(int val)
- {
- // Four cases:
- // 1. 000..255 return 0,val
- // 2. 256..511 return val - 256,255
- // 3. 512..767 return 255, val - 511
- // 4. 768..1023 return val - 768,0
-
- int[] ret = new int[2];
-
- if (val < 256)
- {
- ret[0] = 0;
- ret[1] = val;
- return ret;
- }
- if (val < 512)
- {
- ret[0] = (val % 256);
- ret[1] = 255;
- return ret;
- }
- if (val < 768)
- {
- ret[0] = 255;
- ret[1] = 255 - (val % 256);
- return ret;
- }
- if (val < 1024)
- {
- ret[0] = 255 - (val % 256);
- ret[1] = 255;
- return ret;
- }
-
- throw new Exception("Out of bounds parameter (val)");
- }
- public void fracture(int number, double scalemin, double scalemax)
- {
- Random rand = new Random(seed);
-
- for (int i = 0; i < number; i++)
- {
- int[] a, b;
-
- a = radialEdge256(rand.Next(1023)); // TODO: Broken
- b = radialEdge256(rand.Next(1023)); // TODO: Broken
- double z = rand.NextDouble();
-
- for (int x = 0; x < w; x++)
- {
- for (int y = 0; y < h; y++)
- {
- double miny = Tools.linearInterpolate(a[1], b[1], (double)x / (double)w);
-
- if (y > miny)
- {
- map[x, y] += Tools.linearInterpolate(scalemin, scalemax, z);
- }
- }
- }
- }
- normalise();
- }
- }
-}
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/Generators/Gradient.cs b/libraries/libTerrain/libTerrain/Channel/Generators/Gradient.cs
deleted file mode 100644
index 8f45bf7749..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Generators/Gradient.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
-
- public void gradientCube()
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = x*y;
- }
- }
- normalise();
- }
-
- public void gradientStripe()
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = x;
- }
- }
- normalise();
- }
- }
-}
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/Generators/HillPlanter.cs b/libraries/libTerrain/libTerrain/Channel/Generators/HillPlanter.cs
deleted file mode 100644
index 9316911db3..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Generators/HillPlanter.cs
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Generates a series of spheres which are then either max()'d or added together. Inspired by suggestion from jh.
- ///
- /// 3-Clause BSD Licensed
- /// The number of hills to generate
- /// The minimum size of each hill
- /// The maximum size of each hill
- /// Whether to bias hills towards the center of the map
- /// Whether to add hills together or to pick the largest value
- /// Generates hill-shaped noise instead of consistent hills
- public void hillsSpheres(int number, double scale_min, double scale_range, bool island, bool additive, bool noisy)
- {
- Random random = new Random(seed);
-
- int x, y;
- int i;
-
- for (i = 0; i < number; i++)
- {
- double rx = Math.Min(255.0, random.NextDouble() * w);
- double ry = Math.Min(255.0, random.NextDouble() * h);
- double rand = random.NextDouble();
-
- if (island)
- {
- // Move everything towards the center
- rx -= w / 2;
- rx /= 2;
- rx += w / 2;
-
- ry -= h / 2;
- ry /= 2;
- ry += h / 2;
- }
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (noisy)
- rand = random.NextDouble();
-
- double z = (scale_min + (scale_range * rand));
- z *= z;
- z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
-
- if (z < 0)
- z = 0;
-
- if (additive)
- {
- map[x, y] += z;
- }
- else
- {
- map[x, y] = Math.Max(map[x, y], z);
- }
- }
- }
- }
-
- normalise();
- }
-
- ///
- /// Generates a series of cones which are then either max()'d or added together. Inspired by suggestion from jh.
- ///
- /// 3-Clause BSD Licensed
- /// The number of hills to generate
- /// The minimum size of each hill
- /// The maximum size of each hill
- /// Whether to bias hills towards the center of the map
- /// Whether to add hills together or to pick the largest value
- /// Generates hill-shaped noise instead of consistent hills
- public void hillsCones(int number, double scale_min, double scale_range, bool island, bool additive, bool noisy)
- {
- Random random = new Random(seed);
-
- int x, y;
- int i;
-
- for (i = 0; i < number; i++)
- {
- double rx = Math.Min(255.0, random.NextDouble() * w);
- double ry = Math.Min(255.0, random.NextDouble() * h);
- double rand = random.NextDouble();
-
- if (island)
- {
- // Move everything towards the center
- rx -= w / 2;
- rx /= 2;
- rx += w / 2;
-
- ry -= h / 2;
- ry /= 2;
- ry += h / 2;
- }
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (noisy)
- rand = random.NextDouble();
-
- double z = (scale_min + (scale_range * rand));
- z -= Math.Sqrt(((x - rx) * (x - rx)) + ((y - ry) * (y - ry)));
-
- if (z < 0)
- z = 0;
-
- if (additive)
- {
- map[x, y] += z;
- }
- else
- {
- map[x, y] = Math.Max(map[x, y], z);
- }
- }
- }
- }
-
- normalise();
- }
-
- public void hillsBlocks(int number, double scale_min, double scale_range, bool island, bool additive, bool noisy)
- {
- Random random = new Random(seed);
-
- int x, y;
- int i;
-
- for (i = 0; i < number; i++)
- {
- double rx = Math.Min(255.0, random.NextDouble() * w);
- double ry = Math.Min(255.0, random.NextDouble() * h);
- double rand = random.NextDouble();
-
- if (island)
- {
- // Move everything towards the center
- rx -= w / 2;
- rx /= 2;
- rx += w / 2;
-
- ry -= h / 2;
- ry /= 2;
- ry += h / 2;
- }
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (noisy)
- rand = random.NextDouble();
-
- double z = (scale_min + (scale_range * rand));
- z -= Math.Abs(x-rx) + Math.Abs(y-ry);
- //z -= Math.Sqrt(((x - rx) * (x - rx)) + ((y - ry) * (y - ry)));
-
- if (z < 0)
- z = 0;
-
- if (additive)
- {
- map[x, y] += z;
- }
- else
- {
- map[x, y] = Math.Max(map[x, y], z);
- }
- }
- }
- }
-
- normalise();
- }
-
- public void hillsSquared(int number, double scale_min, double scale_range, bool island, bool additive, bool noisy)
- {
- Random random = new Random(seed);
-
- int x, y;
- int i;
-
- for (i = 0; i < number; i++)
- {
- double rx = Math.Min(255.0, random.NextDouble() * w);
- double ry = Math.Min(255.0, random.NextDouble() * h);
- double rand = random.NextDouble();
-
- if (island)
- {
- // Move everything towards the center
- rx -= w / 2;
- rx /= 2;
- rx += w / 2;
-
- ry -= h / 2;
- ry /= 2;
- ry += h / 2;
- }
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- if (noisy)
- rand = random.NextDouble();
-
- double z = (scale_min + (scale_range * rand));
- z *= z * z * z;
- double dx = Math.Abs(x - rx);
- double dy = Math.Abs(y - ry);
- z -= (dx * dx * dx * dx) + (dy * dy * dy * dy);
-
- if (z < 0)
- z = 0;
-
- if (additive)
- {
- map[x, y] += z;
- }
- else
- {
- map[x, y] = Math.Max(map[x, y], z);
- }
- }
- }
- }
-
- normalise();
- }
-
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Channel/Generators/Midpoint.cs b/libraries/libTerrain/libTerrain/Channel/Generators/Midpoint.cs
deleted file mode 100644
index 0cec05d3dd..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Generators/Midpoint.cs
+++ /dev/null
@@ -1 +0,0 @@
-/* Needs BSD rewrite */
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/Generators/Mountain.cs b/libraries/libTerrain/libTerrain/Channel/Generators/Mountain.cs
deleted file mode 100644
index 0cec05d3dd..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Generators/Mountain.cs
+++ /dev/null
@@ -1 +0,0 @@
-/* Needs BSD rewrite */
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/Generators/Noise.cs b/libraries/libTerrain/libTerrain/Channel/Generators/Noise.cs
deleted file mode 100644
index 7789d3e067..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Generators/Noise.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Fills a channel with 0..1 noise
- ///
- /// 3-Clause BSD Licensed
- public void noise()
- {
- Random rand = new Random(seed);
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = rand.NextDouble();
- }
- }
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Channel/Generators/Spiral.cs b/libraries/libTerrain/libTerrain/Channel/Generators/Spiral.cs
deleted file mode 100644
index ede4600c90..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Generators/Spiral.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- private double[] coordinatesToPolar(int x, int y)
- {
-
- double theta = Math.Atan2(x - (w / 2), y - (h / 2));
- double rx = (double)x - ((double)w / 2);
- double ry = (double)y - ((double)h / 2);
- double r = Math.Sqrt((rx * rx) + (ry * ry));
-
- double[] coords = new double[2];
- coords[0] = r;
- coords[1] = theta;
- return coords;
- }
-
- public int[] polarToCoordinates(double r, double theta) {
- double nx;
- double ny;
-
- nx = (double)r * Math.Cos(theta);
- ny = (double)r * Math.Sin(theta);
-
- nx += w / 2;
- ny += h / 2;
-
- if (nx >= w)
- nx = w - 1;
-
- if (ny >= h)
- ny = h - 1;
-
- if (nx < 0)
- nx = 0;
-
- if (ny < 0)
- ny = 0;
-
- int[] coords = new int[2];
- coords[0] = (int)nx;
- coords[1] = (int)ny;
- return coords;
- }
-
- public void Polar()
- {
- Channel n = this.copy();
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double[] coords = coordinatesToPolar(x,y);
-
- coords[0] += w / 2.0;
- coords[1] += h / 2.0;
-
- map[x, y] = n.map[(int)coords[0] % n.w, (int)coords[1] % n.h];
- }
- }
- }
-
- public void SpiralPlanter(int steps, double incAngle, double incRadius, double offsetRadius, double offsetAngle)
- {
- int i;
- double r = offsetRadius;
- double theta = offsetAngle;
- for (i = 0; i < steps; i++)
- {
- r += incRadius;
- theta += incAngle;
-
- int[] coords = polarToCoordinates(r,theta);
- raise(coords[0], coords[1], 20, 1);
- }
- }
-
- public void SpiralCells(int steps, double incAngle, double incRadius, double offsetRadius, double offsetAngle, double[] c)
- {
- List points = new List();
-
- int i;
- double r = offsetRadius;
- double theta = offsetAngle;
- for (i = 0; i < steps; i++)
- {
- r += incRadius;
- theta += incAngle;
-
- int[] coords = polarToCoordinates(r, theta);
- points.Add(new Point2D(coords[0],coords[1]));
- }
-
- voronoiDiagram(points, c);
- }
-
- public void Spiral(double wid, double hig, double offset)
- {
- int x, y, z;
- z = 0;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- z++;
- double dx = Math.Abs((w / 2) - x);
- double dy = Math.Abs((h / 2) - y);
- map[x, y] += Math.Sin(dx / wid) + Math.Cos(dy / hig);
- }
- }
- normalise();
- }
- }
-}
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/Generators/Voronoi.cs b/libraries/libTerrain/libTerrain/Channel/Generators/Voronoi.cs
deleted file mode 100644
index df21ecc1e7..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Generators/Voronoi.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Generates a Voronoi diagram (sort of a stained glass effect) which will fill the entire channel
- ///
- /// 3-Clause BSD Licensed
- /// The number of generator points in each block
- /// A multiple of the channel width and height which will have voronoi points generated in it.
- /// This is to ensure a more even distribution of the points than pure random allocation.
- /// The Voronoi diagram type. Usually an array with values consisting of [-1,1]. Experiment with the chain, you can have as many values as you like.
- public void voronoiDiagram(int pointsPerBlock, int blockSize, double[] c)
- {
- List points = new List();
- Random generator = new Random(seed);
-
- // Generate the emitter points
- int x, y, i;
- for (x = -blockSize; x < w + blockSize; x += blockSize)
- {
- for (y = -blockSize; y < h + blockSize; y += blockSize)
- {
- for (i = 0; i < pointsPerBlock; i++)
- {
- double pX = x + (generator.NextDouble() * (double)blockSize);
- double pY = y + (generator.NextDouble() * (double)blockSize);
-
- points.Add(new Point2D(pX, pY));
- }
- }
- }
-
- double[] distances = new double[points.Count];
-
- // Calculate the distance each pixel is from an emitter
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- for (i = 0; i < points.Count; i++)
- {
- double dx, dy;
- dx = Math.Abs((double)x - points[i].x);
- dy = Math.Abs((double)y - points[i].y);
-
- distances[i] = (dx * dx + dy * dy);
- }
-
- Array.Sort(distances);
-
- double f = 0.0;
-
- // Multiply the distances with their 'c' counterpart
- // ordering the distances descending
- for (i = 0; i < c.Length; i++)
- {
- if (i >= points.Count)
- break;
-
- f += c[i] * distances[i];
- }
-
- map[x, y] = f;
- }
- }
-
- // Normalise the result
- normalise();
- }
-
- public void voronoiDiagram(List points, double[] c)
- {
-
- Random generator = new Random(seed);
- int x, y, i;
- double[] distances = new double[points.Count];
-
- // Calculate the distance each pixel is from an emitter
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- for (i = 0; i < points.Count; i++)
- {
- double dx, dy;
- dx = Math.Abs((double)x - points[i].x);
- dy = Math.Abs((double)y - points[i].y);
-
- distances[i] = (dx * dx + dy * dy);
- }
-
- Array.Sort(distances);
-
- double f = 0.0;
-
- // Multiply the distances with their 'c' counterpart
- // ordering the distances descending
- for (i = 0; i < c.Length; i++)
- {
- if (i >= points.Count)
- break;
-
- f += c[i] * distances[i];
- }
-
- map[x, y] = f;
- }
- }
-
- // Normalise the result
- normalise();
- }
-
- public void voroflatDiagram(int pointsPerBlock, int blockSize)
- {
- List points = new List();
- Random generator = new Random(seed);
-
- // Generate the emitter points
- int x, y, i;
- for (x = -blockSize; x < w + blockSize; x += blockSize)
- {
- for (y = -blockSize; y < h + blockSize; y += blockSize)
- {
- for (i = 0; i < pointsPerBlock; i++)
- {
- double pX = x + (generator.NextDouble() * (double)blockSize);
- double pY = y + (generator.NextDouble() * (double)blockSize);
-
- points.Add(new Point2D(pX, pY));
- }
- }
- }
-
- double[] distances = new double[points.Count];
-
- // Calculate the distance each pixel is from an emitter
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- for (i = 0; i < points.Count; i++)
- {
- double dx, dy;
- dx = Math.Abs((double)x - points[i].x);
- dy = Math.Abs((double)y - points[i].y);
-
- distances[i] = (dx * dx + dy * dy);
- }
-
- //Array.Sort(distances);
-
- double f = 0.0;
-
- double min = double.MaxValue;
- for (int j = 0; j < distances.Length;j++ )
- {
- if (distances[j] < min)
- {
- min = distances[j];
- f = j;
- }
- }
-
- // Multiply the distances with their 'c' counterpart
- // ordering the distances descending
-
- map[x, y] = f;
- }
- }
-
- // Normalise the result
- normalise();
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Channel/Generators/Worms.cs b/libraries/libTerrain/libTerrain/Channel/Generators/Worms.cs
deleted file mode 100644
index a54c946c98..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Generators/Worms.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// Generates 'number' of worms which navigate randomly around the landscape creating terrain as they go.
- ///
- /// The number of worms which will traverse the map
- /// The number of steps each worm will traverse
- /// The maximum distance each worm will move each step
- /// The size of the area around the worm modified
- /// Do worms start in the middle, or randomly?
- public void worms(int number, int rounds, double movement, double size, bool centerspawn)
- {
- Random random = new Random(seed);
- int i, j;
-
- for (i = 0; i < number; i++)
- {
- double rx, ry;
- if (centerspawn)
- {
- rx = w / 2.0;
- ry = h / 2.0;
- }
- else
- {
- rx = random.NextDouble() * (w - 1);
- ry = random.NextDouble() * (h - 1);
- }
- for (j = 0; j < rounds; j++)
- {
- rx += (random.NextDouble() * movement) - (movement / 2.0);
- ry += (random.NextDouble() * movement) - (movement / 2.0);
- raise(rx, ry, size, 1.0);
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/Grid.cs b/libraries/libTerrain/libTerrain/Channel/Grid.cs
deleted file mode 100644
index 41d20f6201..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Grid.cs
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- public Channel normalise()
- {
- double max = findMax();
- double min = findMin();
-
- int x, y;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = (map[x, y] - min) * (1.0 / (max - min));
- }
- }
-
- return this;
- }
-
- public Channel normalise(double minv, double maxv)
- {
- double max = findMax();
- double min = findMin();
-
- int x, y;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double val = (map[x, y] - min) * (1.0 / max - min);
- val *= maxv - minv;
- val += minv;
-
- map[x, y] = val;
- }
- }
-
- return this;
- }
-
- public Channel clip()
- {
- int x, y;
-
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- setClip(x, y, map[x, y]);
- }
- }
-
- return this;
- }
-
- public Channel clip(double min, double max)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double val = map[x, y];
- if (val > max) val = max;
- if (val < min) val = min;
- map[x, y] = val;
- }
- }
- return this;
- }
-
- public Channel crop(int x1, int y1, int x2, int y2)
- {
- int width = x1 - x2 + 1;
- int height = y1 - y2 + 1;
- Channel chan = new Channel(width, height);
-
- int x, y;
- int nx, ny;
-
- nx = 0;
- for (x = x1; x < x2; x++)
- {
- ny = 0;
- for (y = y1; y < y2; y++)
- {
- chan.map[nx, ny] = map[x, y];
-
- ny++;
- }
- nx++;
- }
-
- return this;
- }
-
- public Channel addClip(Channel other)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = other.map[x, y];
- if (map[x, y] > 1)
- map[x, y] = 1;
- if (map[x, y] < 0)
- map[x, y] = 0;
- }
- }
- return this;
- }
-
- public void smooth(double amount)
- {
- double area = amount;
- double step = amount / 4.0;
-
- double[,] manipulate = new double[w, h];
- int x, y;
- double n, l;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double average = 0.0;
- int avgsteps = 0;
-
- for (n = 0.0 - area; n < area; n += step)
- {
- for (l = 0.0 - area; l < area; l += step)
- {
- avgsteps++;
- average += getBilinearInterpolate(x + n, y + l);
- }
- }
-
- manipulate[x, y] = average / avgsteps;
- }
- }
- map = manipulate;
- }
-
- public void pertubation(double amount)
- {
- // Simple pertubation filter
- double[,] manipulated = new double[w, h];
- Random generator = new Random(seed); // Seeds FTW!
- //double amount = 8.0;
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- double offset_x = (double)x + (generator.NextDouble() * amount) - (amount / 2.0);
- double offset_y = (double)y + (generator.NextDouble() * amount) - (amount / 2.0);
- double p = getBilinearInterpolate(offset_x, offset_y);
- manipulated[x, y] = p;
- }
- }
- map = manipulated;
- }
-
- public void pertubationMask(Channel mask)
- {
- // Simple pertubation filter
- double[,] manipulated = new double[w, h];
- Random generator = new Random(seed); // Seeds FTW!
- //double amount = 8.0;
-
- double amount;
-
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- amount = mask.map[x, y];
- double offset_x = (double)x + (generator.NextDouble() * amount) - (amount / 2.0);
- double offset_y = (double)y + (generator.NextDouble() * amount) - (amount / 2.0);
-
- if (offset_x > w)
- offset_x = w - 1;
- if (offset_y > h)
- offset_y = h - 1;
- if (offset_y < 0)
- offset_y = 0;
- if (offset_x < 0)
- offset_x = 0;
-
- double p = getBilinearInterpolate(offset_x, offset_y);
- manipulated[x, y] = p;
- }
- }
- map = manipulated;
- }
-
- public Channel blend(Channel other, double amount)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = Tools.linearInterpolate(map[x,y],other.map[x,y],amount);
- }
- }
- return this;
- }
-
- public Channel blend(Channel other, Channel amount)
- {
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- map[x, y] = Tools.linearInterpolate(map[x, y], other.map[x, y], amount.map[x,y]);
- }
- }
- return this;
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Channel/Manipulators/AerobicErosion.cs b/libraries/libTerrain/libTerrain/Channel/Manipulators/AerobicErosion.cs
deleted file mode 100644
index ebeabe9c6d..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Manipulators/AerobicErosion.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- // Ideas for Aerobic erosion
- //
- // Unlike thermal (gravity) and hydraulic (water suspension)
- // aerobic erosion should displace mass by moving sediment
- // in "hops". The length of the hop being dictated by the
- // presence of sharp cliffs and wind speed.
-
- // The ability to pickup sediment is defined by the total
- // surface area, such that:
- // 0 0 0
- // 0 1 0
- // 0 0 0
- // Would be the best possible value for sediment to be
- // picked up (total difference = 8) and flatter land
- // will erode less quickly.
-
- // Suspended particles assist the erosion process by hitting
- // the surface and chiselling additional particles off faster
- // than alone.
-
- // Particles are deposited when one of two conditions is met
- // First:
- // When particles hit a wall - such that the
- // wind direction points at a difference >= the
- // deposition mininum talus.
- // Second:
- // When wind speed is lowered to below the minimum
- // required for transit. An idea for this is to
- // use the navier-stokes algorithms for simulating
- // pressure across the terrain.
-
- ///
- /// An experimental erosion algorithm developed by Adam. Moves sediment by factoring the surface area of each height point.
- ///
- /// 0..1 The speed of the wind
- /// The minimum angle at which rock is eroded 0..1 (recommended: <= 0.30)
- /// The minimum angle at which rock is dropped 0..1 (recommended: >= 0.00)
- /// The percentage of rock which can be picked up to pickup 0..1
- /// The number of erosion rounds (recommended: 25+)
- /// Drop sediment at the lowest point?
- public void AerobicErosion(double windspeed, double pickup_talus_minimum, double drop_talus_minimum, double carry, int rounds, bool lowest)
- {
- Channel wind = new Channel(w, h) ;
- Channel sediment = new Channel(w, h);
- int x, y, i, j;
-
- wind = this.copy();
- wind.normalise(); // Cheap wind calculations
- wind *= windspeed;
- wind.pertubation(30); // Can do better later
-
- for (i = 0; i < rounds; i++)
- {
- // Convert some rocks to sand
- for (x = 1; x < w - 1; x++)
- {
- for (y = 1; y < h - 1; y++)
- {
- double me = get(x, y);
- double surfacearea = 0.3; // Everything will erode even if it's flat. Just slower.
-
- for (j = 0; j < 9; j++)
- {
- int[] coords = neighbours(NEIGHBOURS.NEIGHBOUR_MOORE, j);
- double target = get(x + coords[0], y + coords[1]);
-
- surfacearea += Math.Abs(target - me);
- }
-
- double amount = surfacearea * wind.map[x, y] * carry;
-
- if (amount < 0)
- amount = 0;
-
- if (surfacearea > pickup_talus_minimum)
- {
- this.map[x, y] -= amount;
- sediment.map[x, y] += amount;
- }
- }
- }
- sediment.pertubation(10); // Sediment is blown around a bit
- sediment.seed++;
- wind.pertubation(15); // So is the wind
- wind.seed++;
-
- // Convert some sand to rock
- for (x = 1; x < w - 1; x++)
- {
- for (y = 1; y < h - 1; y++)
- {
- double me = get(x, y);
- double surfacearea = 0.01; // Flat land does not get deposition
- double min = double.MaxValue;
- int[] minside = new int[2];
-
- for (j = 0; j < 9; j++)
- {
- int[] coords = neighbours(NEIGHBOURS.NEIGHBOUR_MOORE, j);
- double target = get(x + coords[0], y + coords[1]);
-
- surfacearea += Math.Abs(target - me);
-
- if (target < min && lowest)
- {
- minside = (int[])coords.Clone();
- min = target;
- }
- }
-
- double amount = surfacearea * (1.0 - wind.map[x, y]) * carry;
-
- if (amount < 0)
- amount = 0;
-
- if (surfacearea > drop_talus_minimum)
- {
- this.map[x + minside[0], y + minside[1]] += amount;
- sediment.map[x, y] -= amount;
- }
- }
- }
-
- }
-
- Channel myself = this;
- myself += sediment;
- myself.normalise();
- }
- }
-}
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/Manipulators/HydraulicErosion.cs b/libraries/libTerrain/libTerrain/Channel/Manipulators/HydraulicErosion.cs
deleted file mode 100644
index 0cec05d3dd..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Manipulators/HydraulicErosion.cs
+++ /dev/null
@@ -1 +0,0 @@
-/* Needs BSD rewrite */
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Channel/Manipulators/ThermalWeathering.cs b/libraries/libTerrain/libTerrain/Channel/Manipulators/ThermalWeathering.cs
deleted file mode 100644
index 0cae56d2bf..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Manipulators/ThermalWeathering.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- ///
- /// A thermal weathering implementation based on Musgrave's original 1989 algorithm. This is Adam's custom implementation which may differ slightly from the original.
- ///
- /// The rock angle (represented as a dy/dx ratio) at which point it will be succeptible to breakage
- /// The number of erosion rounds
- /// The amount of rock to carry each round
- public Channel thermalWeathering(double talus, int rounds, double c)
- {
- double[,] lastFrame;
- double[,] thisFrame;
-
- lastFrame = (double[,])map.Clone();
- thisFrame = (double[,])map.Clone();
-
- NEIGHBOURS type = NEIGHBOURS.NEIGHBOUR_MOORE; // Using moore neighbourhood (twice as computationally expensive)
- int NEIGHBOUR_ME = 4; // I am always 4 in both systems.
-
- int NEIGHBOUR_MAX = type == NEIGHBOURS.NEIGHBOUR_MOORE ? 9 : 5;
-
- int frames = rounds; // Number of thermal erosion iterations to run
- int i, j;
- int x, y;
-
- for (i = 0; i < frames; i++)
- {
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- for (j = 0; j < NEIGHBOUR_MAX; j++)
- {
- if (j != NEIGHBOUR_ME)
- {
- int[] coords = neighbours(type, j);
-
- coords[0] += x;
- coords[1] += y;
-
- if (coords[0] > w - 1)
- coords[0] = w - 1;
- if (coords[1] > h - 1)
- coords[1] = h - 1;
- if (coords[0] < 0)
- coords[0] = 0;
- if (coords[1] < 0)
- coords[1] = 0;
-
- double heightF = thisFrame[x, y];
- double target = thisFrame[coords[0], coords[1]];
-
- if (target > heightF + talus)
- {
- double calc = c * ((target - heightF) - talus);
- heightF += calc;
- target -= calc;
- }
-
- thisFrame[x, y] = heightF;
- thisFrame[coords[0], coords[1]] = target;
-
- }
- }
- }
- }
- lastFrame = (double[,])thisFrame.Clone();
- }
-
- map = thisFrame;
-
- normalise(); // Just to guaruntee a smooth 0..1 value
- return this;
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Channel/Neighbours.cs b/libraries/libTerrain/libTerrain/Channel/Neighbours.cs
deleted file mode 100644
index f2b4aedca7..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Neighbours.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- enum NEIGHBOURS
- {
- NEIGHBOUR_MOORE,
- NEIGHBOUR_VONNEUMANN
- };
-
- private int[] neighbours(NEIGHBOURS type, int index)
- {
- int[] coord = new int[2];
-
- index++;
-
- switch (type)
- {
- case NEIGHBOURS.NEIGHBOUR_MOORE:
- switch (index)
- {
- case 1:
- coord[0] = -1;
- coord[1] = -1;
- break;
-
- case 2:
- coord[0] = -0;
- coord[1] = -1;
- break;
-
- case 3:
- coord[0] = +1;
- coord[1] = -1;
- break;
-
- case 4:
- coord[0] = -1;
- coord[1] = -0;
- break;
-
- case 5:
- coord[0] = -0;
- coord[1] = -0;
- break;
-
- case 6:
- coord[0] = +1;
- coord[1] = -0;
- break;
-
- case 7:
- coord[0] = -1;
- coord[1] = +1;
- break;
-
- case 8:
- coord[0] = -0;
- coord[1] = +1;
- break;
-
- case 9:
- coord[0] = +1;
- coord[1] = +1;
- break;
-
- default:
- break;
- }
- break;
-
- case NEIGHBOURS.NEIGHBOUR_VONNEUMANN:
- switch (index)
- {
- case 1:
- coord[0] = 0;
- coord[1] = -1;
- break;
-
- case 2:
- coord[0] = -1;
- coord[1] = 0;
- break;
-
- case 3:
- coord[0] = +1;
- coord[1] = 0;
- break;
-
- case 4:
- coord[0] = 0;
- coord[1] = +1;
- break;
-
- case 5:
- coord[0] = -0;
- coord[1] = -0;
- break;
-
- default:
- break;
- }
- break;
- }
-
- return coord;
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Channel/Operators.cs b/libraries/libTerrain/libTerrain/Channel/Operators.cs
deleted file mode 100644
index 81db690ced..0000000000
--- a/libraries/libTerrain/libTerrain/Channel/Operators.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- partial class Channel
- {
- /* Operator combination of channel datatypes */
-
- public static Channel operator +(Channel A, Channel B)
- {
- if (A.h != B.h)
- throw new Exception("Cannot add heightmaps, of different height.");
- if (A.w != B.w)
- throw new Exception("Cannot add heightmaps, of different width.");
-
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] += B.map[x, y];
- }
- }
-
- return A;
- }
-
- public static Channel operator *(Channel A, Channel B)
- {
- if (A.h != B.h)
- throw new Exception("Cannot multiply heightmaps, of different height.");
- if (A.w != B.w)
- throw new Exception("Cannot multiply heightmaps, of different width.");
-
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] *= B.map[x, y];
- }
- }
-
- return A;
- }
-
- public static Channel operator -(Channel A, Channel B)
- {
- if (A.h != B.h)
- throw new Exception("Cannot subtract heightmaps, of different height.");
- if (A.w != B.w)
- throw new Exception("Cannot subtract heightmaps, of different width.");
-
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] -= B.map[x, y];
- }
- }
-
- return A;
- }
-
- public static Channel operator /(Channel A, Channel B)
- {
- if (A.h != B.h)
- throw new Exception("Cannot divide heightmaps, of different height.");
- if (A.w != B.w)
- throw new Exception("Cannot divide heightmaps, of different width.");
-
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] /= B.map[x, y];
- }
- }
-
- return A;
- }
-
- public static Channel operator ^(Channel A, Channel B)
- {
- if (A.h != B.h)
- throw new Exception("Cannot divide heightmaps, of different height.");
- if (A.w != B.w)
- throw new Exception("Cannot divide heightmaps, of different width.");
-
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] = Math.Pow(A.map[x,y],B.map[x, y]);
- }
- }
-
- return A;
- }
-
-
- /* Operator combination of channel and double datatypes */
-
- public static Channel operator +(Channel A, double B)
- {
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] += B;
- }
- }
-
- return A;
- }
-
- public static Channel operator -(Channel A, double B)
- {
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] -= B;
- }
- }
-
- return A;
- }
-
- public static Channel operator *(Channel A, double B)
- {
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] *= B;
- }
- }
-
- return A;
- }
-
- public static Channel operator /(Channel A, double B)
- {
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] /= B;
- }
- }
-
- return A;
- }
-
- public static Channel operator ^(Channel A, double B)
- {
- int x, y;
-
- for (x = 0; x < A.w; x++)
- {
- for (y = 0; y < A.h; y++)
- {
- A.map[x, y] = Math.Pow(A.map[x,y],B);
- }
- }
-
- return A;
- }
-
- }
-}
diff --git a/libraries/libTerrain/libTerrain/TODO.txt b/libraries/libTerrain/libTerrain/TODO.txt
deleted file mode 100644
index e1998acb13..0000000000
--- a/libraries/libTerrain/libTerrain/TODO.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-TODO
- Anyone is free to take on one of these projects
- since implementations offer differ in results
- the more the merrier.
-
- New Generators
-
- * Musgraves multifractal suite
- * Hybrid Multifractal
- * Ridged Multifractal
- * Heterogenous procedural terrain
-
- Example implementation:
- http://cobweb.ecn.purdue.edu/~ebertd/texture/1stEdition/musgrave/musgrave.c
-
- * Ken Perlin's noise functions
- * Perlin noise
- * Original
- * Improved versions
-
- * Port the libnoise.sourceforge.net generators
-
- * Cellular / Organic Generators
- **ADDED CELLULAR.CS** // Adam Frisby (20/03/2007)
-
- * Finish porting the procedurality code in
- /branches/proceduality/
- currently Java, but porting is easy enough
- mostly a case of find/search/replace.
-
- Improvements
-
- * HillPlanter.cs
- * Add rectangular & square hills
-
- * Voronoi.cs
- * Add different distance metrics
- Currently using Eulicidean distance
- Want:
- * Manhattan Distance
- * Camberra Distance
- * Chebychev Distance
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrain/Test/SimpleTerrain.cs b/libraries/libTerrain/libTerrain/Test/SimpleTerrain.cs
deleted file mode 100644
index 9f0967b237..0000000000
--- a/libraries/libTerrain/libTerrain/Test/SimpleTerrain.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain.Test
-{
- class SimpleTerrain
- {
- public SimpleTerrain()
- {
- Channel terrain = new Channel(256, 256);
- terrain.fill(0.5);
- terrain.thermalWeathering(0.1, 50, 0.1);
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Tools/Point2D.cs b/libraries/libTerrain/libTerrain/Tools/Point2D.cs
deleted file mode 100644
index 69c1148b7a..0000000000
--- a/libraries/libTerrain/libTerrain/Tools/Point2D.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- public class Point2D
- {
- public double x;
- public double y;
-
- public Point2D(double X, double Y)
- {
- x = X;
- y = Y;
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/Tools/Tools.cs b/libraries/libTerrain/libTerrain/Tools/Tools.cs
deleted file mode 100644
index 3f7ab6831f..0000000000
--- a/libraries/libTerrain/libTerrain/Tools/Tools.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libTerrain
-{
- class Tools
- {
- public static double linearInterpolate(double a, double b, double amount)
- {
- return a + ((b - a) * amount);
- }
- public static double exponentialInterpolate(double a, double b, double amount)
- {
- a = Math.Pow(a, amount);
- b = Math.Pow(b - a, 1.0 - amount);
- return a+b;
- }
- public static int powerOf2Log2(int n) {
- for (int i = 0; i < 31; i++) {
- if ((n & 1) == 1) {
- return i;
- }
- n >>= 1;
- }
- return 0;
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrain/libTerrain-BSD.csproj b/libraries/libTerrain/libTerrain/libTerrain-BSD.csproj
deleted file mode 100644
index df6d6517d4..0000000000
--- a/libraries/libTerrain/libTerrain/libTerrain-BSD.csproj
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
- Debug
- AnyCPU
- 8.0.50727
- 2.0
- {EEC06368-30E8-42E8-A23C-2C9D139AD495}
- Library
- Properties
- libTerrain
- libTerrain-BSD
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrainTests/Program.cs b/libraries/libTerrain/libTerrainTests/Program.cs
deleted file mode 100644
index cf3da3d84e..0000000000
--- a/libraries/libTerrain/libTerrainTests/Program.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of libTerrain nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libTerrain;
-
-namespace libTerrainTests
-{
- class Program
- {
- static void Main(string[] args)
- {
- System.Console.WriteLine("Starting tests...");
-
- Channel test;
-
- try
- {
- System.Console.WriteLine("Blank Heightmap");
- test = new Channel();
- test.fill(0);
- test.saveImage("test_blank.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
-
- try
- {
- System.Console.WriteLine("Grayscale Cube");
- test = new Channel();
- test.fill(0);
- test.gradientCube();
- test.saveImage("test_cube.png");
-
- test.Polar();
- test.saveImage("test_polarcube.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Spiral Planters");
- test = new Channel();
- test.fill(0);
-
- test.SpiralPlanter(200, Math.PI / 15, 0.75, 0, 0);
- test.normalise();
- //test.Spiral(192, 192, 50);
- test.saveImage("test_spiral.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Spiral Cells");
- test = new Channel();
- test.fill(0);
-
- double[] c = new double[2];
- c[0] = -1;
- c[1] = 1;
-
- test.SpiralCells(200, Math.PI / 15, 0.75, 0, 0, c);
- test.normalise();
- //test.Spiral(192, 192, 50);
- test.saveImage("test_spiralcells.png");
-
- test.fill(0);
- test.SpiralCells(30, Math.PI / 30, 0, 75, 0, c);
- test.normalise();
- //test.Spiral(192, 192, 50);
- test.saveImage("test_circlecells.png");
-
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Fracturing");
- test = new Channel();
- test.fill(0);
- test.fracture(300, 0, 1);
- test.saveImage("test_fracture.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Voronoi (Flat)");
- test = new Channel();
- test.fill(0);
- test.voroflatDiagram(64, 384);
- test.saveImage("test_voroflat.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
-
- try
- {
- System.Console.WriteLine("Voronoi (Flat / Fixnormal)");
- test = new Channel();
- test.fill(0);
- test.voroflatDiagram(64, 384);
- test ^= 4;
- test.normalise();
- test.saveImage("test_voroflatfixnormal.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("File Import (Mask Flatten)");
- test = new Channel();
- Channel test2;
- test2 = test.loadImage("test_chained_aerobic.png");
-
- test.fill(0);
- test.voroflatDiagram(64, 384);
- test ^= 4;
- test.normalise();
-
- test.smooth(4);
- test.normalise();
-
- test.saveImage("test_flatmask.png");
- test2.flatten(test, 1.0);
-
- test2.saveImage("test_fileflatmask.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Worms");
- test = new Channel();
- test.worms(100, 10, 20.0, 16, false);
- test.normalise();
- test.saveImage("test_worms.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Noise");
- test = new Channel();
- test.noise();
- test.saveImage("test_noise.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Hills (Spherical)");
- test = new Channel();
- test.hillsSpheres(200, 20, 30, true, true, false);
- test.saveImage("test_hillspheres.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Hills (Blocks)");
- test = new Channel();
- test.hillsBlocks(200, 20, 30, true, true, false);
-// test.hillsSpheres(200, 20, 30, true, true, false);
- test.saveImage("test_hillblocks.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Hills (Cones)");
- test = new Channel();
- test.fill(0);
- test.hillsCones(200, 20, 30, true, true, false);
- test.normalise();
- test.saveImage("test_hillcones.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Voronoi Diagram");
- test = new Channel();
- double[] c = new double[2];
- c[0] = -1;
- c[1] = 1;
- test.voronoiDiagram(4, 128, c);
- test.saveImage("test_voronoi.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Raising Terrain");
- test = new Channel();
- test.fill(0);
- test.raise(128, 128, 64, 1.0);
- test.normalise();
- test.saveImage("test_raise.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
- try
- {
- System.Console.WriteLine("Flattening Terrain (unmasked)");
- test = new Channel();
- test.noise();
- test.flatten(128, 128, 64, 1.0);
- test.normalise();
- test.saveImage("test_flatten.png");
- }
- catch (Exception e)
- {
- System.Console.WriteLine("Unhandled exception: " + e.ToString());
- }
-
-
-
- System.Console.WriteLine("Done");
- }
- }
-}
diff --git a/libraries/libTerrain/libTerrainTests/Properties/AssemblyInfo.cs b/libraries/libTerrain/libTerrainTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 09e084598e..0000000000
--- a/libraries/libTerrain/libTerrainTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("libTerrainTests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("libTerrainTests")]
-[assembly: AssemblyCopyright("Copyright © 2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("528417c9-dd71-487e-8e0b-e8e42e52fa10")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/libraries/libTerrain/libTerrainTests/libTerrain.csproj b/libraries/libTerrain/libTerrainTests/libTerrain.csproj
deleted file mode 100644
index 047ad02d4d..0000000000
--- a/libraries/libTerrain/libTerrainTests/libTerrain.csproj
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
- Debug
- AnyCPU
- 8.0.50727
- 2.0
- {EEC06368-30E8-42E8-A23C-2C9D139AD495}
- Library
- Properties
- libTerrain
- libTerrain
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/libraries/libTerrain/libTerrainTests/libTerrainTests.csproj b/libraries/libTerrain/libTerrainTests/libTerrainTests.csproj
deleted file mode 100644
index 422715504f..0000000000
--- a/libraries/libTerrain/libTerrainTests/libTerrainTests.csproj
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
- Debug
- AnyCPU
- 8.0.50727
- 2.0
- {7214C9E2-1390-41BD-BFFC-83FA5931C5CF}
- Exe
- Properties
- libTerrainTests
- libTerrainTests
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
- {EEC06368-30E8-42E8-A23C-2C9D139AD495}
- libTerrain-BSD
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/prebuild.xml b/prebuild.xml
index 314465ebb2..6cf8bd8f06 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -32,123 +32,10 @@
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
+
../../../bin/
@@ -162,6 +49,123 @@
../../../bin/
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../../bin/
+
+
+
+
+ ../../../../bin/
+
+
+
+ ../../../../bin/
+
@@ -172,19 +176,19 @@
-
+
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
@@ -197,19 +201,19 @@
-
+
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
@@ -224,19 +228,19 @@
-
+
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
@@ -248,44 +252,44 @@
-
+
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
-
+
-
+
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
@@ -298,65 +302,65 @@
-
+
- ../../../bin/Physics/
+ ../../../../bin/Physics/
- ../../../bin/Physics/
+ ../../../../bin/Physics/
- ../../../bin/
+ ../../../../bin/
-
+
-
+
- ../../../bin/Physics/
+ ../../../../bin/Physics/
- ../../../bin/Physics/
+ ../../../../bin/Physics/
- ../../../bin/
+ ../../../../bin/
-
+
-
+
- ../../../bin/Physics/
+ ../../../../bin/Physics/
- ../../../bin/Physics/
+ ../../../../bin/Physics/
- ../../../bin/
+ ../../../../bin/
-
+
@@ -365,19 +369,19 @@
-
+
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
- ../../../bin/
+ ../../../../bin/
@@ -388,303 +392,7 @@
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
../../../bin/
@@ -697,6 +405,300 @@
../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../../bin/
+
+
+
+
+ ../../../../bin/
+
+
+
+ ../../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../../bin/
+
+
+
+
+ ../../../../bin/
+
+
+
+ ../../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../../../bin/
+
+
+
+
+ ../../../../bin/
+
+
+
+ ../../../../bin/
@@ -705,14 +707,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -756,20 +758,20 @@
-
-
+
+
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
@@ -779,23 +781,23 @@
-
+
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
-
+
@@ -803,23 +805,23 @@
-
+
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
-
+
@@ -827,47 +829,47 @@
-
+
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
-
+
-
+
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
-
+
@@ -876,24 +878,24 @@
-
+
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
-
+
-
+
@@ -901,130 +903,127 @@
-
+
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
-
-
-
-
+
+
+
+
-
+
-
+
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
-
+
-
+
-
+
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
-
-
-
+
+
+
-
+
-
+
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
- ../../bin/
+ ../../../bin/
-
-
-
-
+
+
+
+
-
+
-
-
-
-
+
../../../bin/
@@ -1049,7 +1048,7 @@
-
+
../../../bin/
diff --git a/tools/mass test client/Arguments.cs b/tools/mass test client/Arguments.cs
deleted file mode 100644
index 302ae95d56..0000000000
--- a/tools/mass test client/Arguments.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.Text.RegularExpressions;
-
-namespace CommandLine.Utility
-{
- ///
- /// Arguments class
- ///
- public class Arguments
- {
- // Variables
- private StringDictionary Parameters;
-
- // Constructor
- public Arguments(string[] Args)
- {
- Parameters = new StringDictionary();
- Regex Splitter = new Regex(@"^-{1,2}|=|:",
- RegexOptions.IgnoreCase | RegexOptions.Compiled);
-
- Regex Remover = new Regex(@"^['""]?(.*?)['""]?$",
- RegexOptions.IgnoreCase | RegexOptions.Compiled);
-
- string Parameter = null;
- string[] Parts;
-
- // Valid parameters forms:
- // {-,/,--}param{ ,=,:}((",')value(",'))
- // Examples:
- // -param1 value1 --param2 /param3:"Test-:-work"
- // /param4=happy -param5 '--=nice=--'
- foreach (string Txt in Args)
- {
- // Look for new parameters (-,/ or --) and a
- // possible enclosed value (=,:)
- Parts = Splitter.Split(Txt, 3);
-
- switch (Parts.Length)
- {
- // Found a value (for the last parameter
- // found (space separator))
- case 1:
- if (Parameter != null)
- {
- if (!Parameters.ContainsKey(Parameter))
- {
- Parts[0] =
- Remover.Replace(Parts[0], "$1");
-
- Parameters.Add(Parameter, Parts[0]);
- }
- Parameter = null;
- }
- // else Error: no parameter waiting for a value (skipped)
- break;
-
- // Found just a parameter
- case 2:
- // The last parameter is still waiting.
- // With no value, set it to true.
- if (Parameter != null)
- {
- if (!Parameters.ContainsKey(Parameter))
- Parameters.Add(Parameter, "true");
- }
- Parameter = Parts[1];
- break;
-
- // Parameter with enclosed value
- case 3:
- // The last parameter is still waiting.
- // With no value, set it to true.
- if (Parameter != null)
- {
- if (!Parameters.ContainsKey(Parameter))
- Parameters.Add(Parameter, "true");
- }
-
- Parameter = Parts[1];
-
- // Remove possible enclosing characters (",')
- if (!Parameters.ContainsKey(Parameter))
- {
- Parts[2] = Remover.Replace(Parts[2], "$1");
- Parameters.Add(Parameter, Parts[2]);
- }
-
- Parameter = null;
- break;
- }
- }
- // In case a parameter is still waiting
- if (Parameter != null)
- {
- if (!Parameters.ContainsKey(Parameter))
- Parameters.Add(Parameter, "true");
- }
- }
-
- // Retrieve a parameter value if it exists
- // (overriding C# indexer property)
- public string this[string Param]
- {
- get
- {
- return (Parameters[Param]);
- }
- }
- }
-}
diff --git a/tools/mass test client/ClientManager.cs b/tools/mass test client/ClientManager.cs
deleted file mode 100644
index a6e784cf0e..0000000000
--- a/tools/mass test client/ClientManager.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Xml;
-using System.Threading;
-using libsecondlife;
-using libsecondlife.Packets;
-using libsecondlife.AssetSystem;
-
-namespace libsecondlife.TestClient
-{
- public class LoginDetails
- {
- public string FirstName;
- public string LastName;
- public string Password;
- public string StartLocation;
- public string MasterName;
- public LLUUID MasterKey;
- public string LoginURI;
- }
-
- public class StartPosition
- {
- public string sim;
- public int x;
- public int y;
- public int z;
-
- public StartPosition()
- {
- this.sim = null;
- this.x = 0;
- this.y = 0;
- this.z = 0;
- }
- }
-
- public class ClientManager
- {
- public Dictionary Clients = new Dictionary();
- public Dictionary> SimPrims = new Dictionary>();
-
- public bool Running = true;
-
- string contactPerson = String.Empty;
- private LLUUID resolvedMasterKey = LLUUID.Zero;
- private ManualResetEvent keyResolution = new ManualResetEvent(false);
-
- ///
- ///
- ///
- ///
- public ClientManager(List accounts, string c)
- {
- this.contactPerson = c;
- foreach (LoginDetails account in accounts)
- Login(account);
- }
-
- public ClientManager(List accounts, string c, string s)
- {
- this.contactPerson = c;
- char sep = '/';
- string[] startbits = s.Split(sep);
-
- foreach (LoginDetails account in accounts)
- {
- account.StartLocation = NetworkManager.StartLocation(startbits[0], Int32.Parse(startbits[1]),
- Int32.Parse(startbits[2]), Int32.Parse(startbits[3]));
- Login(account);
- }
- }
- ///
- ///
- ///
- ///
- ///
- public TestClient Login(LoginDetails account)
- {
-
- // Check if this client is already logged in
- foreach (TestClient c in Clients.Values)
- {
- if (c.Self.FirstName == account.FirstName && c.Self.LastName == account.LastName)
- {
- Logout(c);
- break;
- }
- }
-
- TestClient client = new TestClient(this);
-
- // Optimize the throttle
- client.Throttle.Wind = 0;
- client.Throttle.Cloud = 0;
- client.Throttle.Land = 1000000;
- client.Throttle.Task = 1000000;
-
- client.SimPrims = SimPrims;
- client.MasterName = account.MasterName;
- client.MasterKey = account.MasterKey;
-
- libsecondlife.NetworkManager.LoginParams loginParams = new NetworkManager.LoginParams();
- loginParams.FirstName = account.FirstName;
- loginParams.LastName = account.LastName;
- loginParams.Password = account.Password;
- loginParams.UserAgent = "MassTestClient";
- loginParams.Start = account.StartLocation;
- loginParams.Author = contactPerson;
- loginParams.URI = account.LoginURI;
-
-
- if (!client.Network.Login(loginParams))
- {
- Console.WriteLine("Failed to login " + account.FirstName + " " + account.LastName + ": " +
- client.Network.LoginMessage);
- }
-
-
- if (client.Network.Connected)
- {
- if (account.MasterKey == LLUUID.Zero && !String.IsNullOrEmpty(account.MasterName))
- {
- Console.WriteLine("Resolving {0}'s UUID", account.MasterName);
- // Find master's key from name
- DirectoryManager.DirPeopleReplyCallback callback = new DirectoryManager.DirPeopleReplyCallback(KeyResolvHandler);
- client.Directory.OnDirPeopleReply += callback;
- client.Directory.StartPeopleSearch(DirectoryManager.DirFindFlags.People, account.MasterName, 0);
- if (keyResolution.WaitOne(TimeSpan.FromMinutes(1), false))
- {
- account.MasterKey = resolvedMasterKey;
- Console.WriteLine("\"{0}\" resolved to {1}", account.MasterName, account.MasterKey);
- }
- else
- {
- Console.WriteLine("Unable to obtain UUID for \"{0}\". No master will be used. Try specifying a key with --masterkey.", account.MasterName);
- }
- client.Directory.OnDirPeopleReply -= callback;
- keyResolution.Reset();
- }
-
- client.MasterKey = account.MasterKey;
-
- Clients[client.Network.AgentID] = client;
-
- Console.WriteLine("Logged in " + client.ToString());
- }
-
- return client;
- }
-
- private void KeyResolvHandler(LLUUID queryid, List matches)
- {
- LLUUID master = matches[0].AgentID;
- if (matches.Count > 1)
- {
- Console.WriteLine("Possible masters:");
- for (int i = 0; i < matches.Count; ++i)
- {
- Console.WriteLine("{0}: {1}", i, matches[i].FirstName + " " + matches[i].LastName);
- }
- Console.Write("Ambiguous master, choose one:");
- string read = Console.ReadLine();
- while (read != null)
- {
- int choice = 0;
- if (int.TryParse(read, out choice))
- {
- master = matches[choice].AgentID;
- break;
- }
- else
- {
- Console.WriteLine("Responce misunderstood.");
- Console.Write("Type the corresponding number:");
- }
- read = Console.ReadLine();
- }
- }
- resolvedMasterKey = master;
- keyResolution.Set();
- }
-
- ///
- ///
- ///
- ///
- ///
- public TestClient Login(string[] args)
- {
- LoginDetails account = new LoginDetails();
- account.FirstName = args[0];
- account.LastName = args[1];
- account.Password = args[2];
-
- if (args.Length == 4)
- {
- account.StartLocation = NetworkManager.StartLocation(args[3], 128, 128, 40);
- }
-
- return Login(account);
- }
-
- ///
- ///
- ///
- public void Run(List massTestCommands)
- {
- Console.WriteLine("Type quit to exit. Type help for a command list.");
-
- if (massTestCommands.Count == 0)
- {
- while (Running)
- {
- PrintPrompt();
- string input = Console.ReadLine();
- DoCommandAll(input, null, null);
- }
- }
- else
- {
- int currentCommand = 0;
- while (Running)
- {
- DoCommandAll(massTestCommands[currentCommand], null, null);
- currentCommand++;
- if (massTestCommands.Count >= currentCommand)
- {
- currentCommand = 0;
- }
- }
- }
-
- foreach (SecondLife client in Clients.Values)
- {
- if (client.Network.Connected)
- client.Network.Logout();
- }
- }
-
- private void PrintPrompt()
- {
- int online = 0;
-
- foreach (SecondLife client in Clients.Values)
- {
- if (client.Network.Connected) online++;
- }
-
- Console.Write(online + " avatars online> ");
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void DoCommandAll(string cmd, LLUUID fromAgentID, LLUUID imSessionID)
- {
- string[] tokens = cmd.Trim().Split(new char[] { ' ', '\t' });
- string firstToken = tokens[0].ToLower();
-
- if (tokens.Length == 0)
- return;
-
- if (firstToken == "login")
- {
- // Special login case: Only call it once, and allow it with
- // no logged in avatars
- string[] args = new string[tokens.Length - 1];
- Array.Copy(tokens, 1, args, 0, args.Length);
- Login(args);
- }
- else if (firstToken == "quit")
- {
- Quit();
- Console.WriteLine("All clients logged out and program finished running.");
- }
- else
- {
- // make a copy of the clients list so that it can be iterated without fear of being changed during iteration
- Dictionary clientsCopy = new Dictionary(Clients);
-
- foreach (TestClient client in clientsCopy.Values)
- client.DoCommand(cmd, fromAgentID, imSessionID);
- }
- }
-
- ///
- ///
- ///
- ///
- public void Logout(TestClient client)
- {
- Clients.Remove(client.Network.AgentID);
- client.Network.Logout();
- }
-
- ///
- ///
- ///
- public void LogoutAll()
- {
- // make a copy of the clients list so that it can be iterated without fear of being changed during iteration
- Dictionary clientsCopy = new Dictionary(Clients);
-
- foreach (TestClient client in clientsCopy.Values)
- Logout(client);
- }
-
- ///
- ///
- ///
- public void Quit()
- {
- LogoutAll();
- Running = false;
- // TODO: It would be really nice if we could figure out a way to abort the ReadLine here in so that Run() will exit.
- }
- }
-}
diff --git a/tools/mass test client/Command.cs b/tools/mass test client/Command.cs
deleted file mode 100644
index 051519dba0..0000000000
--- a/tools/mass test client/Command.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public abstract class Command
- {
- public string Name;
- public string Description;
- public TestClient Client;
-
- public abstract string Execute(string[] args, LLUUID fromAgentID);
-
- ///
- /// When set to true, think will be called.
- ///
- public bool Active;
-
- ///
- /// Called twice per second, when Command.Active is set to true.
- ///
- public virtual void Think()
- {
- }
- }
-}
diff --git a/tools/mass test client/Commands/CloneProfileCommand.cs b/tools/mass test client/Commands/CloneProfileCommand.cs
deleted file mode 100644
index e475655f36..0000000000
--- a/tools/mass test client/Commands/CloneProfileCommand.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class CloneProfileCommand : Command
- {
- Avatar.AvatarProperties Properties;
- Avatar.Interests Interests;
- List Groups = new List();
- bool ReceivedProperties = false;
- bool ReceivedInterests = false;
- bool ReceivedGroups = false;
- ManualResetEvent ReceivedProfileEvent = new ManualResetEvent(false);
-
- public CloneProfileCommand(TestClient testClient)
- {
- testClient.Avatars.OnAvatarInterests += new AvatarManager.AvatarInterestsCallback(Avatars_OnAvatarInterests);
- testClient.Avatars.OnAvatarProperties += new AvatarManager.AvatarPropertiesCallback(Avatars_OnAvatarProperties);
- testClient.Avatars.OnAvatarGroups += new AvatarManager.AvatarGroupsCallback(Avatars_OnAvatarGroups);
- testClient.Self.OnJoinGroup += new MainAvatar.JoinGroupCallback(Self_OnJoinGroup);
-
- Name = "cloneprofile";
- Description = "Clones another avatars profile as closely as possible. WARNING: This command will " +
- "destroy your existing profile! Usage: cloneprofile [targetuuid]";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 1)
- return Description;
-
- LLUUID targetID;
- ReceivedProperties = false;
- ReceivedInterests = false;
- ReceivedGroups = false;
-
- try
- {
- targetID = new LLUUID(args[0]);
- }
- catch (Exception)
- {
- return Description;
- }
-
- // Request all of the packets that make up an avatar profile
- Client.Avatars.RequestAvatarProperties(targetID);
-
- // Wait for all the packets to arrive
- ReceivedProfileEvent.Reset();
- ReceivedProfileEvent.WaitOne(5000, false);
-
- // Check if everything showed up
- if (!ReceivedInterests || !ReceivedProperties || !ReceivedGroups)
- return "Failed to retrieve a complete profile for that UUID";
-
- // Synchronize our profile
- Client.Self.ProfileInterests = Interests;
- Client.Self.ProfileProperties = Properties;
- Client.Self.SetAvatarInformation();
-
- // TODO: Leave all the groups we're currently a member of? This could
- // break TestClient connectivity that might be relying on group authentication
-
- // Attempt to join all the groups
- foreach (LLUUID groupID in Groups)
- {
- Client.Self.RequestJoinGroup(groupID);
- }
-
- return "Synchronized our profile to the profile of " + targetID.ToStringHyphenated();
- }
-
- void Avatars_OnAvatarProperties(LLUUID avatarID, Avatar.AvatarProperties properties)
- {
- lock (ReceivedProfileEvent)
- {
- Properties = properties;
- ReceivedProperties = true;
-
- if (ReceivedInterests && ReceivedProperties && ReceivedGroups)
- ReceivedProfileEvent.Set();
- }
- }
-
- void Avatars_OnAvatarInterests(LLUUID avatarID, Avatar.Interests interests)
- {
- lock (ReceivedProfileEvent)
- {
- Interests = interests;
- ReceivedInterests = true;
-
- if (ReceivedInterests && ReceivedProperties && ReceivedGroups)
- ReceivedProfileEvent.Set();
- }
- }
-
- void Avatars_OnAvatarGroups(LLUUID avatarID, AvatarGroupsReplyPacket.GroupDataBlock[] groups)
- {
- lock (ReceivedProfileEvent)
- {
- foreach (AvatarGroupsReplyPacket.GroupDataBlock block in groups)
- {
- Groups.Add(block.GroupID);
- }
-
- ReceivedGroups = true;
-
- if (ReceivedInterests && ReceivedProperties && ReceivedGroups)
- ReceivedProfileEvent.Set();
- }
- }
-
- void Self_OnJoinGroup(LLUUID groupID, bool success)
- {
- Console.WriteLine(Client.ToString() + (success ? " joined " : " failed to join ") +
- groupID.ToStringHyphenated());
-
- if (success)
- {
- Console.WriteLine(Client.ToString() + " setting " + groupID.ToStringHyphenated() +
- " as the active group");
- Client.Self.ActivateGroup(groupID);
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/Communication/EchoMasterCommand.cs b/tools/mass test client/Commands/Communication/EchoMasterCommand.cs
deleted file mode 100644
index a7c3d3f2b0..0000000000
--- a/tools/mass test client/Commands/Communication/EchoMasterCommand.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class EchoMasterCommand: Command
- {
- public EchoMasterCommand(TestClient testClient)
- {
- Name = "echoMaster";
- Description = "Repeat everything that master says.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (!Active)
- {
- Active = true;
- Client.Self.OnChat += new MainAvatar.ChatCallback(Self_OnChat);
- return "Echoing is now on.";
- }
- else
- {
- Active = false;
- Client.Self.OnChat -= new MainAvatar.ChatCallback(Self_OnChat);
- return "Echoing is now off.";
- }
- }
-
- void Self_OnChat(string message, MainAvatar.ChatAudibleLevel audible, MainAvatar.ChatType type,
- MainAvatar.ChatSourceType sourcetype, string fromName, LLUUID id, LLUUID ownerid, LLVector3 position)
- {
- if (message.Length > 0 && Client.MasterKey == id)
- {
- Client.Self.Chat(message, 0, MainAvatar.ChatType.Normal);
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/Communication/IMCommand.cs b/tools/mass test client/Commands/Communication/IMCommand.cs
deleted file mode 100644
index d847291d42..0000000000
--- a/tools/mass test client/Commands/Communication/IMCommand.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class ImCommand : Command
- {
- string ToAvatarName = String.Empty;
- ManualResetEvent NameSearchEvent = new ManualResetEvent(false);
- Dictionary Name2Key = new Dictionary();
-
- public ImCommand(TestClient testClient)
- {
- testClient.Avatars.OnAvatarNameSearch += new AvatarManager.AvatarNameSearchCallback(Avatars_OnAvatarNameSearch);
-
- Name = "im";
- Description = "Instant message someone. Usage: im [firstname] [lastname] [message]";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length < 3)
- return "Usage: im [firstname] [lastname] [message]";
-
- ToAvatarName = args[0] + " " + args[1];
-
- // Build the message
- string message = String.Empty;
- for (int ct = 2; ct < args.Length; ct++)
- message += args[ct] + " ";
- message = message.TrimEnd();
- if (message.Length > 1023) message = message.Remove(1023);
-
- if (!Name2Key.ContainsKey(ToAvatarName.ToLower()))
- {
- // Send the Query
- Client.Avatars.RequestAvatarNameSearch(ToAvatarName, LLUUID.Random());
-
- NameSearchEvent.WaitOne(6000, false);
- }
-
- if (Name2Key.ContainsKey(ToAvatarName.ToLower()))
- {
- LLUUID id = Name2Key[ToAvatarName.ToLower()];
-
- Client.Self.InstantMessage(id, message, id);
- return "Instant Messaged " + id.ToStringHyphenated() + " with message: " + message;
- }
- else
- {
- return "Name lookup for " + ToAvatarName + " failed";
- }
- }
-
- void Avatars_OnAvatarNameSearch(LLUUID queryID, Dictionary avatars)
- {
- foreach (KeyValuePair kvp in avatars)
- {
- if (kvp.Value.ToLower() == ToAvatarName.ToLower())
- {
- Name2Key[ToAvatarName.ToLower()] = kvp.Key;
- NameSearchEvent.Set();
- return;
- }
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/Communication/SayCommand.cs b/tools/mass test client/Commands/Communication/SayCommand.cs
deleted file mode 100644
index 2ab9db48aa..0000000000
--- a/tools/mass test client/Commands/Communication/SayCommand.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace libsecondlife.TestClient
-{
- public class SayCommand: Command
- {
- public SayCommand(TestClient testClient)
- {
- Name = "say";
- Description = "Say something. (usage: say (optional channel) whatever)";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- int channel = 0;
- int startIndex = 0;
-
- if (args.Length < 1)
- {
- return "usage: say (optional channel) whatever";
- }
- else if (args.Length > 1)
- {
- if (Int32.TryParse(args[0], out channel))
- startIndex = 1;
- }
-
- StringBuilder message = new StringBuilder();
-
- for (int i = startIndex; i < args.Length; i++)
- {
- message.Append(args[i]);
- if (i != args.Length - 1) message.Append(" ");
- }
-
- Client.Self.Chat(message.ToString(), channel, MainAvatar.ChatType.Normal);
-
- return "Said " + message.ToString();
- }
- }
-}
diff --git a/tools/mass test client/Commands/Communication/ShoutCommand.cs b/tools/mass test client/Commands/Communication/ShoutCommand.cs
deleted file mode 100644
index 3533e3d4f4..0000000000
--- a/tools/mass test client/Commands/Communication/ShoutCommand.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class ShoutCommand : Command
- {
- public ShoutCommand(TestClient testClient)
- {
- Name = "shout";
- Description = "Shout something.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- int channel = 0;
- int startIndex = 0;
- string message = String.Empty;
- if (args.Length < 1)
- {
- return "usage: shout (optional channel) whatever";
- }
- else if (args.Length > 1)
- {
- try
- {
- channel = Convert.ToInt32(args[0]);
- startIndex = 1;
- }
- catch (FormatException)
- {
- channel = 0;
- }
- }
-
- for (int i = startIndex; i < args.Length; i++)
- {
- message += args[i] + " ";
- }
-
- Client.Self.Chat(message, channel, MainAvatar.ChatType.Shout);
-
- return "Shouted " + message;
- }
- }
-}
diff --git a/tools/mass test client/Commands/Communication/TtsCommand.cs b/tools/mass test client/Commands/Communication/TtsCommand.cs
deleted file mode 100644
index 52b7a39a54..0000000000
--- a/tools/mass test client/Commands/Communication/TtsCommand.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Speech.Synthesis;
-using libsecondlife;
-using libsecondlife.Packets;
-using libsecondlife.AssetSystem;
-
-
-// Since this requires .Net 3.0 I've left it out of the project by default.
-// To use this: include it in the project and add a reference to the System.Speech.dll
-
-namespace libsecondlife.TestClient
-{
- public class TtsCommand : Command
- {
- SpeechSynthesizer _speechSynthesizer;
-
- public TtsCommand(TestClient testClient)
- {
- Name = "tts";
- Description = "Text To Speech. When activated, client will echo all recieved chat messages out thru the computer's speakers.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (!Active)
- {
- if (_speechSynthesizer == null)
- _speechSynthesizer = new SpeechSynthesizer();
- Active = true;
- Client.Self.OnChat += new MainAvatar.ChatCallback(Self_OnChat);
- return "TTS is now on.";
- }
- else
- {
- Active = false;
- Client.Self.OnChat -= new MainAvatar.ChatCallback(Self_OnChat);
- return "TTS is now off.";
- }
- }
-
- void Self_OnChat(string message, byte audible, byte type, byte sourcetype, string fromName, LLUUID id, LLUUID ownerid, LLVector3 position)
- {
- if (message.Length > 0)
- {
- _speechSynthesizer.SpeakAsync(message);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tools/mass test client/Commands/Communication/WhisperCommand.cs b/tools/mass test client/Commands/Communication/WhisperCommand.cs
deleted file mode 100644
index 4bfda33030..0000000000
--- a/tools/mass test client/Commands/Communication/WhisperCommand.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class WhisperCommand : Command
- {
- public WhisperCommand(TestClient testClient)
- {
- Name = "whisper";
- Description = "Whisper something.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- int channel = 0;
- int startIndex = 0;
- string message = String.Empty;
- if (args.Length < 1)
- {
- return "usage: whisper (optional channel) whatever";
- }
- else if (args.Length > 1)
- {
- try
- {
- channel = Convert.ToInt32(args[0]);
- startIndex = 1;
- }
- catch (FormatException)
- {
- channel = 0;
- }
- }
-
- for (int i = startIndex; i < args.Length; i++)
- {
- message += args[i] + " ";
- }
-
- Client.Self.Chat(message, channel, MainAvatar.ChatType.Whisper);
-
- return "Whispered " + message;
- }
- }
-}
diff --git a/tools/mass test client/Commands/GoHome.cs b/tools/mass test client/Commands/GoHome.cs
deleted file mode 100644
index 0ac04f40d5..0000000000
--- a/tools/mass test client/Commands/GoHome.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class GoHomeCommand : Command
- {
- public GoHomeCommand(TestClient testClient)
- {
- Name = "gohome";
- Description = "Teleports home";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if ( Client.Self.GoHome() ) {
- return "Teleport Home Succesful";
- } else {
- return "Teleport Home Failed";
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/GotoLandmark.cs b/tools/mass test client/Commands/GotoLandmark.cs
deleted file mode 100644
index d32047c6ff..0000000000
--- a/tools/mass test client/Commands/GotoLandmark.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class GotoLandmarkCommand : Command
- {
- public GotoLandmarkCommand(TestClient testClient)
- {
- Name = "goto_landmark";
- Description = "Teleports to a Landmark ";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- LLUUID landmark = new LLUUID();
- if ( ! LLUUID.TryParse(args[0], out landmark) ) {
- return "Invalid LLUID";
- } else {
- Console.WriteLine("Teleporting to " + landmark.ToString());
- }
- if ( Client.Self.Teleport(landmark) ) {
- return "Teleport Succesful";
- } else {
- return "Teleport Failed";
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/Inventory/AppearanceCommand.cs b/tools/mass test client/Commands/Inventory/AppearanceCommand.cs
deleted file mode 100644
index 43aa784586..0000000000
--- a/tools/mass test client/Commands/Inventory/AppearanceCommand.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class AppearanceCommand : Command
- {
- Utilities.Assets.AssetManager Assets;
- Utilities.Appearance.AppearanceManager Appearance;
-
- public AppearanceCommand(TestClient testClient)
- {
- Name = "appearance";
- Description = "Set your current appearance to your last saved appearance";
-
- Assets = new libsecondlife.Utilities.Assets.AssetManager(testClient);
- Appearance = new libsecondlife.Utilities.Appearance.AppearanceManager(testClient, Assets);
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- Appearance.SetPreviousAppearance();
- return "Done.";
- }
- }
-}
diff --git a/tools/mass test client/Commands/Inventory/BalanceCommand.cs b/tools/mass test client/Commands/Inventory/BalanceCommand.cs
deleted file mode 100644
index 46044f2a01..0000000000
--- a/tools/mass test client/Commands/Inventory/BalanceCommand.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class BalanceCommand: Command
- {
- public BalanceCommand(TestClient testClient)
- {
- Name = "balance";
- Description = "Shows the amount of L$.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- return Client.ToString() + " has L$: " + Client.Self.Balance;
- }
- }
-}
diff --git a/tools/mass test client/Commands/Inventory/DeleteFolderCommand.cs b/tools/mass test client/Commands/Inventory/DeleteFolderCommand.cs
deleted file mode 100644
index 081ff86ba5..0000000000
--- a/tools/mass test client/Commands/Inventory/DeleteFolderCommand.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Xml;
-using System.Xml.Serialization;
-
-using libsecondlife;
-using libsecondlife.Packets;
-using libsecondlife.InventorySystem;
-
-namespace libsecondlife.TestClient
-{
- public class DeleteFolderCommand : Command
- {
- public DeleteFolderCommand(TestClient testClient)
- {
- Name = "deleteFolder";
- Description = "Deletes a folder from inventory.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- return "Broken until someone fixes me";
-
- //string target = String.Empty;
- //for (int ct = 0; ct < args.Length; ct++)
- // target = target + args[ct] + " ";
- //target = target.TrimEnd();
-
- //Client.Inventory.DownloadInventory();
- //InventoryFolder folder = Client.Inventory.getFolder(target);
- //if (folder != null)
- //{
- // folder.Delete();
- // return "Folder " + target + " deleted.";
- //}
-
- //return "Unable to find: " + target;
- }
- }
-}
\ No newline at end of file
diff --git a/tools/mass test client/Commands/Inventory/DumpOutfitCommand.cs b/tools/mass test client/Commands/Inventory/DumpOutfitCommand.cs
deleted file mode 100644
index 8347accfd3..0000000000
--- a/tools/mass test client/Commands/Inventory/DumpOutfitCommand.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Text;
-using System.IO;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Utilities.Assets;
-using libsecondlife.Utilities.Appearance;
-
-namespace libsecondlife.TestClient
-{
- public class DumpOutfitCommand : Command
- {
- libsecondlife.Utilities.Assets.AssetManager Assets;
- List OutfitAssets = new List();
-
- public DumpOutfitCommand(TestClient testClient)
- {
- Name = "dumpoutfit";
- Description = "Dumps all of the textures from an avatars outfit to the hard drive. Usage: dumpoutfit [avatar-uuid]";
-
- Assets = new AssetManager(testClient);
- Assets.OnImageReceived += new AssetManager.ImageReceivedCallback(Assets_OnImageReceived);
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 1)
- return "Usage: dumpoutfit [avatar-uuid]";
-
- LLUUID target;
-
- if (!LLUUID.TryParse(args[0], out target))
- return "Usage: dumpoutfit [avatar-uuid]";
-
- lock (Client.AvatarList)
- {
- foreach (Avatar avatar in Client.AvatarList.Values)
- {
- if (avatar.ID == target)
- {
- StringBuilder output = new StringBuilder("Downloading ");
-
- lock (OutfitAssets) OutfitAssets.Clear();
-
- foreach (KeyValuePair face in avatar.Textures.FaceTextures)
- {
- ImageType type = ImageType.Normal;
-
- switch ((AppearanceManager.TextureIndex)face.Key)
- {
- case AppearanceManager.TextureIndex.HeadBaked:
- case AppearanceManager.TextureIndex.EyesBaked:
- case AppearanceManager.TextureIndex.UpperBaked:
- case AppearanceManager.TextureIndex.LowerBaked:
- case AppearanceManager.TextureIndex.SkirtBaked:
- type = ImageType.Baked;
- break;
- }
-
- Assets.RequestImage(face.Value.TextureID, type, 100000.0f, 0);
-
- output.Append(((AppearanceManager.TextureIndex)face.Key).ToString());
- output.Append(" ");
- }
-
- return output.ToString();
- }
- }
- }
-
- return "Couldn't find avatar " + target.ToStringHyphenated();
- }
-
- private void Assets_OnImageReceived(ImageDownload image)
- {
- if (image.Success)
- {
- try
- {
- File.WriteAllBytes(image.ID.ToStringHyphenated() + ".jp2", image.AssetData);
- Console.WriteLine("Wrote JPEG2000 image " + image.ID.ToStringHyphenated() + ".jp2");
-
- byte[] tgaFile = OpenJPEGNet.OpenJPEG.DecodeToTGA(image.AssetData);
- File.WriteAllBytes(image.ID.ToStringHyphenated() + ".tga", tgaFile);
- Console.WriteLine("Wrote TGA image " + image.ID.ToStringHyphenated() + ".tga");
- }
- catch (Exception e)
- {
- Console.WriteLine(e.ToString());
- }
- }
- else
- {
- Console.WriteLine("Failed to download image " + image.ID.ToStringHyphenated());
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/Inventory/ExportOutfitCommand.cs b/tools/mass test client/Commands/Inventory/ExportOutfitCommand.cs
deleted file mode 100644
index 9a91d0097b..0000000000
--- a/tools/mass test client/Commands/Inventory/ExportOutfitCommand.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class ExportOutfitCommand : Command
- {
- public ExportOutfitCommand(TestClient testClient)
- {
- Name = "exportoutfit";
- Description = "Exports an avatars outfit to an xml file. Usage: exportoutfit avataruuid outputfile.xml";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 2)
- return "Usage: exportoutfit avataruuid outputfile.xml";
-
- LLUUID id;
-
- try
- {
- id = new LLUUID(args[0]);
- }
- catch (Exception)
- {
- return "Usage: exportoutfit avataruuid outputfile.xml";
- }
-
- lock (Client.Appearances)
- {
- if (Client.Appearances.ContainsKey(id))
- {
- try
- {
- XmlWriterSettings settings = new XmlWriterSettings();
- settings.Indent = true;
- XmlWriter writer = XmlWriter.Create(args[1], settings);
- try
- {
- Client.Appearances[id].ToXml(writer);
- }
- finally
- {
- writer.Close();
- }
- }
- catch (Exception e)
- {
- return e.ToString();
- }
-
- return "Exported appearance for avatar " + id.ToString() + " to " + args[1];
- }
- else
- {
- return "Couldn't find an appearance for avatar " + id.ToString();
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tools/mass test client/Commands/Inventory/GiveAllCommand.cs b/tools/mass test client/Commands/Inventory/GiveAllCommand.cs
deleted file mode 100644
index 8890ea0cc4..0000000000
--- a/tools/mass test client/Commands/Inventory/GiveAllCommand.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class GiveAllCommand: Command
- {
- public GiveAllCommand(TestClient testClient)
- {
- Name = "giveAll";
- Description = "Gives you all it's money.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (fromAgentID == null)
- return "Unable to send money to console. This command only works when IMed.";
-
- int amount = Client.Self.Balance;
- Client.Self.GiveMoney(fromAgentID, Client.Self.Balance, String.Empty);
- return "Gave $" + amount + " to " + fromAgentID;
- }
- }
-}
diff --git a/tools/mass test client/Commands/Inventory/ImportOutfitCommand.cs b/tools/mass test client/Commands/Inventory/ImportOutfitCommand.cs
deleted file mode 100644
index 595ce980d3..0000000000
--- a/tools/mass test client/Commands/Inventory/ImportOutfitCommand.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class ImportOutfitCommand : Command
- {
- private uint SerialNum = 1;
-
- public ImportOutfitCommand(TestClient testClient)
- {
- Name = "importoutfit";
- Description = "Imports an appearance from an xml file. Usage: importoutfit inputfile.xml";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 1)
- return "Usage: importoutfit inputfile.xml";
-
- try
- {
- XmlReader reader = XmlReader.Create(args[0]);
- XmlSerializer serializer = new XmlSerializer(typeof(Packet));
- AvatarAppearancePacket appearance = (AvatarAppearancePacket)serializer.Deserialize(reader);
- reader.Close();
-
- AgentSetAppearancePacket set = new AgentSetAppearancePacket();
-
- set.AgentData.AgentID = Client.Network.AgentID;
- set.AgentData.SessionID = Client.Network.SessionID;
- set.AgentData.SerialNum = SerialNum++;
-
- float AV_Height_Range = 2.025506f - 1.50856f;
- float AV_Height = 1.50856f + (((float)appearance.VisualParam[25].ParamValue / 255.0f) * AV_Height_Range);
- set.AgentData.Size = new LLVector3(0.45f, 0.6f, AV_Height);
-
- set.ObjectData.TextureEntry = appearance.ObjectData.TextureEntry;
- set.VisualParam = new AgentSetAppearancePacket.VisualParamBlock[appearance.VisualParam.Length];
-
- int i = 0;
- foreach (AvatarAppearancePacket.VisualParamBlock block in appearance.VisualParam)
- {
- set.VisualParam[i] = new AgentSetAppearancePacket.VisualParamBlock();
- set.VisualParam[i].ParamValue = block.ParamValue;
- i++;
- }
-
- set.WearableData = new AgentSetAppearancePacket.WearableDataBlock[0];
-
- Client.Network.SendPacket(set);
- }
- catch (Exception)
- {
- return "Failed to import the appearance XML file, maybe it doesn't exist or is in the wrong format?";
- }
-
- return "Imported " + args[0] + " and sent an AgentSetAppearance packet";
- }
- }
-}
diff --git a/tools/mass test client/Commands/Inventory/InventoryCommand.cs b/tools/mass test client/Commands/Inventory/InventoryCommand.cs
deleted file mode 100644
index da5dc73ed7..0000000000
--- a/tools/mass test client/Commands/Inventory/InventoryCommand.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Xml;
-using System.Xml.Serialization;
-
-using libsecondlife;
-using libsecondlife.Packets;
-using libsecondlife.InventorySystem;
-
-namespace libsecondlife.TestClient
-{
- public class InventoryCommand : Command
- {
- public InventoryCommand(TestClient testClient)
- {
- Name = "i";
- Description = "Prints out inventory.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- return "Broken until someone fixes me";
-
- //Client.Inventory.DownloadInventory();
- //StringBuilder result = new StringBuilder();
- //PrintFolder(Client.Inventory.GetRootFolder(), result, 0);
- //return result.ToString();
- }
-
- //void PrintFolder(InventoryFolder folder, StringBuilder output, int indenting)
- //{
- // Indent(output, indenting);
- // output.Append(folder.Name);
- // output.Append("\n");
- // foreach (InventoryBase b in folder.GetContents())
- // {
- // InventoryItem item = b as InventoryItem;
- // if (item != null)
- // {
- // Indent(output, indenting + 1);
- // output.Append(item.Name);
- // output.Append("\n");
- // continue;
- // }
- // InventoryFolder subFolder = b as InventoryFolder;
- // if (subFolder != null)
- // PrintFolder(subFolder, output, indenting + 1);
- // }
- //}
-
- //void Indent(StringBuilder output, int indenting)
- //{
- // for (int count = 0; count < indenting; count++)
- // {
- // output.Append(" ");
- // }
- //}
- }
-}
\ No newline at end of file
diff --git a/tools/mass test client/Commands/Inventory/WearCommand.cs b/tools/mass test client/Commands/Inventory/WearCommand.cs
deleted file mode 100644
index d7c1432b13..0000000000
--- a/tools/mass test client/Commands/Inventory/WearCommand.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Xml;
-using System.Xml.Serialization;
-
-using libsecondlife;
-using libsecondlife.Packets;
-using libsecondlife.InventorySystem;
-
-namespace libsecondlife.TestClient
-{
- public class WearCommand : Command
- {
- public WearCommand(TestClient testClient)
- {
- Name = "wear";
- Description = "Wear an outfit folder from inventory. Usage: wear [outfit name]";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- string target = String.Empty;
-
- for (int ct = 0; ct < args.Length; ct++)
- target = target + args[ct] + " ";
-
- target = target.TrimEnd();
-
- InventoryFolder folder = Client.Inventory.getFolder(target);
-
- if (folder != null)
- {
- Client.Appearance.WearOutfit(folder);
- return "Outfit " + target + " worn.";
- }
-
- return "Unable to find: " + target;
- }
- }
-}
diff --git a/tools/mass test client/Commands/Land/FindSimCommand.cs b/tools/mass test client/Commands/Land/FindSimCommand.cs
deleted file mode 100644
index 4fcd35cb7f..0000000000
--- a/tools/mass test client/Commands/Land/FindSimCommand.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class FindSimCommand : Command
- {
- public FindSimCommand(TestClient testClient)
- {
- Name = "findsim";
- Description = "Searches for a simulator and returns information about it. Usage: findsim [Simulator Name]";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length < 1)
- return "Usage: findsim [Simulator Name]";
-
- // Build the simulator name from the args list
- string simName = string.Empty;
- for (int i = 0; i < args.Length; i++)
- simName += args[i] + " ";
- simName = simName.TrimEnd().ToLower();
-
- //if (!GridDataCached[Client])
- //{
- // Client.Grid.RequestAllSims(GridManager.MapLayerType.Objects);
- // System.Threading.Thread.Sleep(5000);
- // GridDataCached[Client] = true;
- //}
-
- GridRegion region;
-
- if (Client.Grid.GetGridRegion(simName, out region))
- return String.Format("{0}: handle={1} ({2},{3})", region.Name, region.RegionHandle, region.X, region.Y);
- else
- return "Lookup of " + simName + " failed";
- }
- }
-}
diff --git a/tools/mass test client/Commands/Land/ParcelInfoCommand.cs b/tools/mass test client/Commands/Land/ParcelInfoCommand.cs
deleted file mode 100644
index 7119a47953..0000000000
--- a/tools/mass test client/Commands/Land/ParcelInfoCommand.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using libsecondlife;
-using libsecondlife.Utilities;
-
-namespace libsecondlife.TestClient
-{
- public class ParcelInfoCommand : Command
- {
- private ParcelDownloader ParcelDownloader;
- private ManualResetEvent ParcelsDownloaded = new ManualResetEvent(false);
- private int ParcelCount = 0;
-
- public ParcelInfoCommand(TestClient testClient)
- {
- Name = "parcelinfo";
- Description = "Prints out info about all the parcels in this simulator";
-
- ParcelDownloader = new ParcelDownloader(testClient);
- ParcelDownloader.OnParcelsDownloaded += new ParcelDownloader.ParcelsDownloadedCallback(Parcels_OnParcelsDownloaded);
- testClient.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(Network_OnDisconnected);
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- ParcelDownloader.DownloadSimParcels(Client.Network.CurrentSim);
-
- ParcelsDownloaded.Reset();
- ParcelsDownloaded.WaitOne(20000, false);
-
- if (Client.Network.CurrentSim != null)
- return "Downloaded information for " + ParcelCount + " parcels in " + Client.Network.CurrentSim.Name;
- else
- return String.Empty;
- }
-
- void Parcels_OnParcelsDownloaded(Simulator simulator, Dictionary Parcels, int[,] map)
- {
- foreach (KeyValuePair parcel in Parcels)
- {
- WaterType type = ParcelDownloader.GetWaterType(map, parcel.Value.LocalID);
- float delta = ParcelDownloader.GetHeightRange(map, parcel.Value.LocalID);
- int deviation = ParcelDownloader.GetRectangularDeviation(parcel.Value.AABBMin, parcel.Value.AABBMax,
- parcel.Value.Area);
-
- Console.WriteLine("Parcels[{0}]: Name: \"{1}\", Description: \"{2}\" ACL Count: {3}, " +
- "Location: {4}, Height Range: {5}, Shape Deviation: {6}", parcel.Key, parcel.Value.Name,
- parcel.Value.Desc, parcel.Value.AccessList.Count, type.ToString(), delta, deviation);
- }
-
- ParcelCount = Parcels.Count;
-
- ParcelsDownloaded.Set();
- }
-
- void Network_OnDisconnected(NetworkManager.DisconnectType reason, string message)
- {
- ParcelsDownloaded.Set();
- }
- }
-}
diff --git a/tools/mass test client/Commands/Movement/FollowCommand.cs b/tools/mass test client/Commands/Movement/FollowCommand.cs
deleted file mode 100644
index 49be106a8b..0000000000
--- a/tools/mass test client/Commands/Movement/FollowCommand.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class FollowCommand: Command
- {
- public FollowCommand(TestClient testClient)
- {
- Name = "follow";
- Description = "Follow another avatar. (usage: follow [FirstName LastName]) If no target is set then will follow master.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- string target = String.Empty;
- for (int ct = 0; ct < args.Length; ct++)
- target = target + args[ct] + " ";
- target = target.TrimEnd();
-
- if (target.Length > 0)
- {
- if (Follow(target))
- return "Following " + target;
- else
- return "Unable to follow " + target + ". Client may not be able to see that avatar.";
- }
- else
- {
- if (Follow(Client.MasterKey))
- return "Following " + Client.MasterKey;
- else
- return "No target specified and no master not found. usage: follow [FirstName LastName])";
- }
- }
-
- const float DISTANCE_BUFFER = 3.0f;
- Avatar followAvatar;
-
- bool Follow(string name)
- {
- foreach (Avatar av in Client.AvatarList.Values)
- {
- if (av.Name == name)
- {
- followAvatar = av;
- Active = true;
- return true;
- }
- }
- return false;
- }
-
- bool Follow(LLUUID id)
- {
- foreach (Avatar av in Client.AvatarList.Values)
- {
- if (av.ID == id)
- {
- followAvatar = av;
- Active = true;
- return true;
- }
- }
- return false;
- }
-
- public override void Think()
- {
- if (Helpers.VecDist(followAvatar.Position, Client.Self.Position) > DISTANCE_BUFFER)
- {
- //move toward target
- LLVector3 avPos = followAvatar.Position;
- Client.Self.AutoPilot((ulong)avPos.X + (ulong)Client.regionX, (ulong)avPos.Y + (ulong)Client.regionY, avPos.Z);
- }
- //else
- //{
- // //stop at current position
- // LLVector3 myPos = client.Self.Position;
- // client.Self.AutoPilot((ulong)myPos.x, (ulong)myPos.y, myPos.Z);
- //}
-
- base.Think();
- }
-
- }
-}
diff --git a/tools/mass test client/Commands/Movement/GotoCommand.cs b/tools/mass test client/Commands/Movement/GotoCommand.cs
deleted file mode 100644
index fbbc2ec07c..0000000000
--- a/tools/mass test client/Commands/Movement/GotoCommand.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class GotoCommand: Command
- {
- public GotoCommand(TestClient testClient)
- {
- Name = "goto";
- Description = "Teleport to a location (e.g. \"goto Hooper/100/100/30\")";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length < 1)
- return "usage: Destination should be specified as sim/x/y/z";
-
- string destination = String.Empty;
-
- // Handle multi-word sim names by combining the arguments
- foreach (string arg in args)
- {
- destination += arg + " ";
- }
- destination = destination.Trim();
-
- string[] tokens = destination.Split(new char[] { '/' });
- if (tokens.Length != 4)
- return "usage: Destination should be specified as sim/x/y/z";
-
- string sim = tokens[0];
- float x = Client.Self.Position.X;
- float y = Client.Self.Position.Y;
- float z = Client.Self.Position.Z;
- float.TryParse(tokens[1], out x);
- float.TryParse(tokens[2], out y);
- float.TryParse(tokens[3], out z);
-
- if (Client.Self.Teleport(sim, new LLVector3(x, y, z)))
- {
- return "Teleported to " + Client.Network.CurrentSim;
- }
- else
- {
- return "Teleport failed: " + Client.Self.TeleportMessage;
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/Movement/JumpCommand.cs b/tools/mass test client/Commands/Movement/JumpCommand.cs
deleted file mode 100644
index 6cead83bc3..0000000000
--- a/tools/mass test client/Commands/Movement/JumpCommand.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class JumpCommand: Command
- {
- public JumpCommand(TestClient testClient)
- {
- Name = "jump";
- Description = "Teleports to the specified height. (e.g. \"jump 1000\")";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 1)
- return "usage: jump 1000";
-
- float height = 0;
- float.TryParse(args[0], out height);
-
- Client.Self.Teleport
- (
- Client.Network.CurrentSim.Name,
- new LLVector3(Client.Self.Position.X, Client.Self.Position.Y, Client.Self.Position.Z + height)
- );
-
- return "Jumped " + height;
- }
- }
-}
diff --git a/tools/mass test client/Commands/Movement/LocationCommand.cs b/tools/mass test client/Commands/Movement/LocationCommand.cs
deleted file mode 100644
index 1758a48236..0000000000
--- a/tools/mass test client/Commands/Movement/LocationCommand.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class LocationCommand: Command
- {
- public LocationCommand(TestClient testClient)
- {
- Name = "location";
- Description = "Show the location.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- return "CurrentSim: '" + Client.Network.CurrentSim.ToString() + "' Position: " +
- Client.Self.Position.ToString();
- }
- }
-}
diff --git a/tools/mass test client/Commands/Movement/MoveToCommand.cs b/tools/mass test client/Commands/Movement/MoveToCommand.cs
deleted file mode 100644
index 2b3c7d7397..0000000000
--- a/tools/mass test client/Commands/Movement/MoveToCommand.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libsecondlife.TestClient.Commands.Movement {
- class MovetoCommand : Command {
- public MovetoCommand(TestClient client) {
- Name = "moveto";
- Description = "Moves the avatar to the specified global position using simulator autopilot.";
- }
- public override string Execute(string[] args, LLUUID fromAgentID) {
- if (args.Length != 3)
- return "usage: moveto x y z";
- float x = Client.Self.Position.X + Client.regionX;
- float y = Client.Self.Position.Y + Client.regionY;
- float z = Client.Self.Position.Z;
- float.TryParse(args[0], out x);
- float.TryParse(args[1], out y);
- float.TryParse(args[2], out z);
- Client.Self.AutoPilot((ulong)x, (ulong)y, z);
- return "Attempting to move to <" + x + ", " + y + ", " + z + ">";
- }
- }
-}
diff --git a/tools/mass test client/Commands/Movement/SetHome.cs b/tools/mass test client/Commands/Movement/SetHome.cs
deleted file mode 100644
index 5e14ca6d6f..0000000000
--- a/tools/mass test client/Commands/Movement/SetHome.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class SetHomeCommand : Command
- {
- public SetHomeCommand(TestClient testClient)
- {
- Name = "sethome";
- Description = "Sets home to the current location.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- Client.Self.SetHome();
- return "Home Set";
- }
- }
-}
diff --git a/tools/mass test client/Commands/Movement/SitCommand.cs b/tools/mass test client/Commands/Movement/SitCommand.cs
deleted file mode 100644
index 1735615b07..0000000000
--- a/tools/mass test client/Commands/Movement/SitCommand.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class SitCommand: Command
- {
- public SitCommand(TestClient testClient)
- {
- Name = "sit";
- Description = "Attempt to sit on the closest prim";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- Primitive closest = null;
- double closestDistance = Double.MaxValue;
-
- lock (Client.SimPrims)
- {
- if (Client.SimPrims.ContainsKey(Client.Network.CurrentSim))
- {
- foreach (Primitive p in Client.SimPrims[Client.Network.CurrentSim].Values)
- {
- float distance = Helpers.VecDist(Client.Self.Position, p.Position);
-
- if (closest == null || distance < closestDistance)
- {
- closest = p;
- closestDistance = distance;
- }
- }
- }
- }
-
- if (closest != null)
- {
- Client.Self.RequestSit(closest.ID, LLVector3.Zero);
- Client.Self.Sit();
-
- return "Sat on " + closest.ID + ". Distance: " + closestDistance;
- }
- else
- {
- return "Couldn't find a nearby prim to sit on";
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/Movement/SitOnCommand.cs b/tools/mass test client/Commands/Movement/SitOnCommand.cs
deleted file mode 100644
index 381f50ca9c..0000000000
--- a/tools/mass test client/Commands/Movement/SitOnCommand.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class SitOnCommand: Command
- {
- public SitOnCommand(TestClient testClient)
- {
- Name = "siton";
- Description = "Attempt to sit on a particular prim, with specified UUID";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- LLObject targetSeat = null;
-
- lock (Client.SimPrims)
- {
- if (Client.SimPrims.ContainsKey(Client.Network.CurrentSim))
- {
- foreach (LLObject p in Client.SimPrims[Client.Network.CurrentSim].Values)
- {
- try
- {
- if (p.ID == args[0])
- targetSeat = p;
- }
- catch
- {
- // handle exception
- return "Sorry, I don't think " + args[0] + " is a valid UUID. I'm unable to sit there.";
- }
- }
- }
- }
-
- if (targetSeat != null)
- {
- Client.Self.RequestSit(targetSeat.ID, LLVector3.Zero);
- Client.Self.Sit();
-
- return "Sat on prim " + targetSeat.ID + ".";
- }
- else
- {
- return "Couldn't find specified prim to sit on";
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tools/mass test client/Commands/Movement/StandCommand.cs b/tools/mass test client/Commands/Movement/StandCommand.cs
deleted file mode 100644
index bb8542bd2c..0000000000
--- a/tools/mass test client/Commands/Movement/StandCommand.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class StandCommand: Command
- {
- public StandCommand(TestClient testClient)
- {
- Name = "stand";
- Description = "Stand";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- Client.Self.Status.StandUp = true;
- stand(Client);
- return "Standing up.";
- }
-
- void stand(SecondLife client)
- {
- SendAgentUpdate(client, (uint)MainAvatar.ControlFlags.AGENT_CONTROL_STAND_UP);
- }
-
- const float DRAW_DISTANCE = 96.0f;
- void SendAgentUpdate(SecondLife client, uint ControlID)
- {
- AgentUpdatePacket p = new AgentUpdatePacket();
- p.AgentData.Far = DRAW_DISTANCE;
- //LLVector3 myPos = client.Self.Position;
- p.AgentData.CameraCenter = new LLVector3(0, 0, 0);
- p.AgentData.CameraAtAxis = new LLVector3(0, 0, 0);
- p.AgentData.CameraLeftAxis = new LLVector3(0, 0, 0);
- p.AgentData.CameraUpAxis = new LLVector3(0, 0, 0);
- p.AgentData.HeadRotation = new LLQuaternion(0, 0, 0, 1); ;
- p.AgentData.BodyRotation = new LLQuaternion(0, 0, 0, 1); ;
- p.AgentData.AgentID = client.Network.AgentID;
- p.AgentData.SessionID = client.Network.SessionID;
- p.AgentData.ControlFlags = ControlID;
- client.Network.SendPacket(p);
- }
- }
-}
diff --git a/tools/mass test client/Commands/Prims/ExportCommand.cs b/tools/mass test client/Commands/Prims/ExportCommand.cs
deleted file mode 100644
index da4e45f2c6..0000000000
--- a/tools/mass test client/Commands/Prims/ExportCommand.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml;
-using System.Text;
-using System.Threading;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class ExportCommand : Command
- {
- AutoResetEvent GotPermissionsEvent = new AutoResetEvent(false);
- LLObject.ObjectPropertiesFamily Properties;
- bool GotPermissions = false;
- LLUUID SelectedObject = LLUUID.Zero;
-
- Dictionary PrimsWaiting = new Dictionary();
- AutoResetEvent AllPropertiesReceived = new AutoResetEvent(false);
-
- public ExportCommand(TestClient testClient)
- {
- testClient.Objects.OnObjectPropertiesFamily += new ObjectManager.ObjectPropertiesFamilyCallback(Objects_OnObjectPropertiesFamily);
- testClient.Objects.OnObjectProperties += new ObjectManager.ObjectPropertiesCallback(Objects_OnObjectProperties);
- testClient.Avatars.OnPointAt += new AvatarManager.PointAtCallback(Avatars_OnPointAt);
-
- Name = "export";
- Description = "Exports an object to an xml file. Usage: export uuid outputfile.xml";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 2 && !(args.Length == 1 && SelectedObject != LLUUID.Zero))
- return "Usage: export uuid outputfile.xml";
-
- LLUUID id;
- uint localid = 0;
- int count = 0;
- string file;
-
- if (args.Length == 2)
- {
- file = args[1];
- if (!LLUUID.TryParse(args[0], out id))
- return "Usage: export uuid outputfile.xml";
- }
- else
- {
- file = args[0];
- id = SelectedObject;
- }
-
- lock (Client.SimPrims)
- {
- if (Client.SimPrims.ContainsKey(Client.Network.CurrentSim))
- {
- foreach (Primitive prim in Client.SimPrims[Client.Network.CurrentSim].Values)
- {
- if (prim.ID == id)
- {
- if (prim.ParentID != 0)
- localid = prim.ParentID;
- else
- localid = prim.LocalID;
-
- break;
- }
- }
- }
- }
-
- if (localid != 0)
- {
- // Check for export permission first
- Client.Objects.RequestObjectPropertiesFamily(Client.Network.CurrentSim, id);
- GotPermissionsEvent.WaitOne(8000, false);
-
- if (!GotPermissions)
- {
- return "Couldn't fetch permissions for the requested object, try again";
- }
- else
- {
- GotPermissions = false;
- if (Properties.OwnerID != Client.Network.AgentID &&
- Properties.OwnerID != Client.MasterKey &&
- Client.Network.AgentID != Client.Self.ID)
- {
- return "That object is owned by " + Properties.OwnerID + ", we don't have permission " +
- "to export it";
- }
- }
-
- try
- {
- XmlWriterSettings settings = new XmlWriterSettings();
- settings.Indent = true;
- XmlWriter writer = XmlWriter.Create(file, settings);
-
- try
- {
- List prims = new List();
-
- lock (Client.SimPrims)
- {
- if (Client.SimPrims.ContainsKey(Client.Network.CurrentSim))
- {
- foreach (Primitive prim in Client.SimPrims[Client.Network.CurrentSim].Values)
- {
- if (prim.LocalID == localid || prim.ParentID == localid)
- {
- prims.Add(prim);
- count++;
- }
- }
- }
- }
-
- bool complete = RequestObjectProperties(prims, 250);
-
- //Serialize it!
- Helpers.PrimListToXml(prims, writer);
-
- if (!complete) {
- Console.WriteLine("Warning: Unable to retrieve full properties for:");
- foreach (LLUUID uuid in PrimsWaiting.Keys)
- Console.WriteLine(uuid);
- }
- }
- finally
- {
- writer.Close();
- }
- }
- catch (Exception e)
- {
- string ret = "Failed to write to " + file + ":" + e.ToString();
- if (ret.Length > 1000)
- {
- ret = ret.Remove(1000);
- }
- return ret;
- }
- return "Exported " + count + " prims to " + file;
- }
- else
- {
- return "Couldn't find UUID " + id.ToString() + " in the " +
- Client.SimPrims[Client.Network.CurrentSim].Count +
- "objects currently indexed in the current simulator";
- }
- }
-
- private bool RequestObjectProperties(List objects, int msPerRequest)
- {
- // Create an array of the local IDs of all the prims we are requesting properties for
- uint[] localids = new uint[objects.Count];
-
- lock (PrimsWaiting)
- {
- PrimsWaiting.Clear();
-
- for (int i = 0; i < objects.Count; ++i)
- {
- localids[i] = objects[i].LocalID;
- PrimsWaiting.Add(objects[i].ID, objects[i]);
- }
- }
-
- Client.Objects.SelectObjects(Client.Network.CurrentSim, localids);
-
- return AllPropertiesReceived.WaitOne(2000 + msPerRequest * objects.Count, false);
- }
-
- void Avatars_OnPointAt(LLUUID sourceID, LLUUID targetID, LLVector3d targetPos,
- MainAvatar.PointAtType pointType, float duration, LLUUID id)
- {
- if (sourceID == Client.MasterKey)
- {
- //Client.DebugLog("Master is now selecting " + targetID.ToStringHyphenated());
- SelectedObject = targetID;
- }
- }
-
- void Objects_OnObjectPropertiesFamily(Simulator simulator, LLObject.ObjectPropertiesFamily properties)
- {
- Properties = properties;
- GotPermissions = true;
- GotPermissionsEvent.Set();
- }
-
- void Objects_OnObjectProperties(Simulator simulator, LLObject.ObjectProperties properties)
- {
- lock (PrimsWaiting)
- {
- Primitive prim;
- if (PrimsWaiting.TryGetValue(properties.ObjectID, out prim))
- {
- prim.Properties = properties;
- }
- PrimsWaiting.Remove(properties.ObjectID);
-
- if (PrimsWaiting.Count == 0)
- AllPropertiesReceived.Set();
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/Prims/ExportParticlesCommand.cs b/tools/mass test client/Commands/Prims/ExportParticlesCommand.cs
deleted file mode 100644
index 8fced68ce9..0000000000
--- a/tools/mass test client/Commands/Prims/ExportParticlesCommand.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using libsecondlife;
-
-namespace libsecondlife.TestClient
-{
- public class ExportParticlesCommand : Command
- {
- public ExportParticlesCommand(TestClient testClient)
- {
- Name = "exportparticles";
- Description = "Reverse engineers a prim with a particle system to an LSL script. Usage: exportscript [prim-uuid]";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 1)
- return "Usage: exportparticles [prim-uuid]";
-
- LLUUID id;
- if (!LLUUID.TryParse(args[0], out id))
- return "Usage: exportparticles [prim-uuid]";
-
- lock (Client.SimPrims)
- {
- if (Client.SimPrims.ContainsKey(Client.Network.CurrentSim))
- {
- foreach (Primitive prim in Client.SimPrims[Client.Network.CurrentSim].Values)
- {
- if (prim.ID == id)
- {
- if (prim.ParticleSys.CRC != 0)
- {
- StringBuilder lsl = new StringBuilder();
-
- lsl.Append("default" + Environment.NewLine);
- lsl.Append("{" + Environment.NewLine);
- lsl.Append(" state_entry()" + Environment.NewLine);
- lsl.Append(" {" + Environment.NewLine);
- lsl.Append(" llParticleSystem([" + Environment.NewLine);
-
- lsl.Append(" PSYS_PART_FLAGS, 0");
-
- if ((prim.ParticleSys.PartDataFlags & Primitive.ParticleSystem.ParticleDataFlags.InterpColor) != 0)
- lsl.Append(" | PSYS_PART_INTERP_COLOR_MASK");
- if ((prim.ParticleSys.PartDataFlags & Primitive.ParticleSystem.ParticleDataFlags.InterpScale) != 0)
- lsl.Append(" | PSYS_PART_INTERP_SCALE_MASK");
- if ((prim.ParticleSys.PartDataFlags & Primitive.ParticleSystem.ParticleDataFlags.Bounce) != 0)
- lsl.Append(" | PSYS_PART_BOUNCE_MASK");
- if ((prim.ParticleSys.PartDataFlags & Primitive.ParticleSystem.ParticleDataFlags.Wind) != 0)
- lsl.Append(" | PSYS_PART_WIND_MASK");
- if ((prim.ParticleSys.PartDataFlags & Primitive.ParticleSystem.ParticleDataFlags.FollowSrc) != 0)
- lsl.Append(" | PSYS_PART_FOLLOW_SRC_MASK");
- if ((prim.ParticleSys.PartDataFlags & Primitive.ParticleSystem.ParticleDataFlags.FollowVelocity) != 0)
- lsl.Append(" | PSYS_PART_FOLLOW_VELOCITY_MASK");
- if ((prim.ParticleSys.PartDataFlags & Primitive.ParticleSystem.ParticleDataFlags.TargetPos) != 0)
- lsl.Append(" | PSYS_PART_TARGET_POS_MASK");
- if ((prim.ParticleSys.PartDataFlags & Primitive.ParticleSystem.ParticleDataFlags.TargetLinear) != 0)
- lsl.Append(" | PSYS_PART_TARGET_LINEAR_MASK");
- if ((prim.ParticleSys.PartDataFlags & Primitive.ParticleSystem.ParticleDataFlags.Emissive) != 0)
- lsl.Append(" | PSYS_PART_EMISSIVE_MASK");
-
- lsl.Append(","); lsl.Append(Environment.NewLine);
- lsl.Append(" PSYS_SRC_PATTERN, 0");
-
- if ((prim.ParticleSys.Pattern & Primitive.ParticleSystem.SourcePattern.Drop) != 0)
- lsl.Append(" | PSYS_SRC_PATTERN_DROP");
- if ((prim.ParticleSys.Pattern & Primitive.ParticleSystem.SourcePattern.Explode) != 0)
- lsl.Append(" | PSYS_SRC_PATTERN_EXPLODE");
- if ((prim.ParticleSys.Pattern & Primitive.ParticleSystem.SourcePattern.Angle) != 0)
- lsl.Append(" | PSYS_SRC_PATTERN_ANGLE");
- if ((prim.ParticleSys.Pattern & Primitive.ParticleSystem.SourcePattern.AngleCone) != 0)
- lsl.Append(" | PSYS_SRC_PATTERN_ANGLE_CONE");
- if ((prim.ParticleSys.Pattern & Primitive.ParticleSystem.SourcePattern.AngleConeEmpty) != 0)
- lsl.Append(" | PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY");
-
- lsl.Append("," + Environment.NewLine);
-
- lsl.Append(" PSYS_PART_START_ALPHA, " + String.Format("{0:0.00000}", prim.ParticleSys.PartStartColor.A) + "," + Environment.NewLine);
- lsl.Append(" PSYS_PART_END_ALPHA, " + String.Format("{0:0.00000}", prim.ParticleSys.PartEndColor.A) + "," + Environment.NewLine);
- lsl.Append(" PSYS_PART_START_COLOR, " + prim.ParticleSys.PartStartColor.ToStringRGB() + "," + Environment.NewLine);
- lsl.Append(" PSYS_PART_END_COLOR, " + prim.ParticleSys.PartEndColor.ToStringRGB() + "," + Environment.NewLine);
- lsl.Append(" PSYS_PART_START_SCALE, <" + String.Format("{0:0.00000}", prim.ParticleSys.PartStartScaleX) + ", " + String.Format("{0:0.00000}", prim.ParticleSys.PartStartScaleY) + ", 0>, " + Environment.NewLine);
- lsl.Append(" PSYS_PART_END_SCALE, <" + String.Format("{0:0.00000}", prim.ParticleSys.PartEndScaleX) + ", " + String.Format("{0:0.00000}", prim.ParticleSys.PartEndScaleY) + ", 0>, " + Environment.NewLine);
- lsl.Append(" PSYS_PART_MAX_AGE, " + String.Format("{0:0.00000}", prim.ParticleSys.PartMaxAge) + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_MAX_AGE, " + String.Format("{0:0.00000}", prim.ParticleSys.MaxAge) + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_ACCEL, " + prim.ParticleSys.PartAcceleration.ToString() + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_BURST_PART_COUNT, " + String.Format("{0:0}", prim.ParticleSys.BurstPartCount) + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_BURST_RADIUS, " + String.Format("{0:0.00000}", prim.ParticleSys.BurstRadius) + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_BURST_RATE, " + String.Format("{0:0.00000}", prim.ParticleSys.BurstRate) + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_BURST_SPEED_MIN, " + String.Format("{0:0.00000}", prim.ParticleSys.BurstSpeedMin) + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_BURST_SPEED_MAX, " + String.Format("{0:0.00000}", prim.ParticleSys.BurstSpeedMax) + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_INNERANGLE, " + String.Format("{0:0.00000}", prim.ParticleSys.InnerAngle) + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_OUTERANGLE, " + String.Format("{0:0.00000}", prim.ParticleSys.OuterAngle) + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_OMEGA, " + prim.ParticleSys.AngularVelocity.ToString() + "," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_TEXTURE, (key)\"" + prim.ParticleSys.Texture.ToStringHyphenated() + "\"," + Environment.NewLine);
- lsl.Append(" PSYS_SRC_TARGET_KEY, (key)\"" + prim.ParticleSys.Target.ToStringHyphenated() + "\"" + Environment.NewLine);
-
- lsl.Append(" ]);" + Environment.NewLine);
- lsl.Append(" }" + Environment.NewLine);
- lsl.Append("}" + Environment.NewLine);
-
- return lsl.ToString();
- }
- else
- {
- return "Prim " + prim.LocalID + " does not have a particle system";
- }
- }
- }
- }
- }
-
- return "Couldn't find prim " + id.ToStringHyphenated();
- }
- }
-}
diff --git a/tools/mass test client/Commands/Prims/ImportCommand.cs b/tools/mass test client/Commands/Prims/ImportCommand.cs
deleted file mode 100644
index 5f8723a1fd..0000000000
--- a/tools/mass test client/Commands/Prims/ImportCommand.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Threading;
-using System.IO;
-using libsecondlife;
-
-namespace libsecondlife.TestClient
-{
- enum ImporterState
- {
- RezzingParent,
- RezzingChildren,
- Linking,
- Idle
- }
-
- public class Linkset
- {
- public Primitive RootPrim;
- public List Children = new List();
-
- public Linkset()
- {
- RootPrim = new Primitive();
- }
-
- public Linkset(Primitive rootPrim)
- {
- RootPrim = rootPrim;
- }
- }
-
- public class ImportCommand : Command
- {
- Primitive currentPrim;
- LLVector3 currentPosition;
- SecondLife currentClient;
- AutoResetEvent primDone;
- List primsCreated;
- List linkQueue;
- uint rootLocalID = 0;
- bool registeredCreateEvent = false;
-
- ImporterState state = ImporterState.Idle;
-
- public ImportCommand(TestClient testClient)
- {
- Name = "import";
- Description = "Import prims from an exported xml file. Usage: import inputfile.xml";
- primDone = new AutoResetEvent(false);
- registeredCreateEvent = false;
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 1)
- return "Usage: import inputfile.xml";
-
- string filename = args[0];
- Dictionary prims;
-
- currentClient = Client;
-
- try
- {
- XmlReader reader = XmlReader.Create(filename);
- List listprims = Helpers.PrimListFromXml(reader);
- reader.Close();
-
- // Create a dictionary indexed by the old local ID of the prims
- prims = new Dictionary();
- foreach (Primitive prim in listprims)
- {
- prims.Add(prim.LocalID, prim);
- }
- }
- catch (Exception)
- {
- return "Failed to import the object XML file, maybe it doesn't exist or is in the wrong format?";
- }
-
- if (!registeredCreateEvent)
- {
- Client.OnPrimCreated += new TestClient.PrimCreatedCallback(TestClient_OnPrimCreated);
- registeredCreateEvent = true;
- }
-
- // Build an organized structure from the imported prims
- Dictionary linksets = new Dictionary();
- foreach (Primitive prim in prims.Values)
- {
- if (prim.ParentID == 0)
- {
- if (linksets.ContainsKey(prim.LocalID))
- linksets[prim.LocalID].RootPrim = prim;
- else
- linksets[prim.LocalID] = new Linkset(prim);
- }
- else
- {
- if (!linksets.ContainsKey(prim.ParentID))
- linksets[prim.ParentID] = new Linkset();
-
- linksets[prim.ParentID].Children.Add(prim);
- }
- }
-
- primsCreated = new List();
- Console.WriteLine("Importing " + linksets.Count + " structures.");
-
- foreach (Linkset linkset in linksets.Values)
- {
- if (linkset.RootPrim.LocalID != 0)
- {
- state = ImporterState.RezzingParent;
- currentPrim = linkset.RootPrim;
- // HACK: Offset the root prim position so it's not lying on top of the original
- // We need a more elaborate solution for importing with relative or absolute offsets
- linkset.RootPrim.Position = Client.Self.Position;
- linkset.RootPrim.Position.Z += 3.0f;
- currentPosition = linkset.RootPrim.Position;
- // A better solution would move the bot to the desired position.
- // or to check if we are within a certain distance of the desired position.
-
- // Rez the root prim with no rotation
- LLQuaternion rootRotation = linkset.RootPrim.Rotation;
- linkset.RootPrim.Rotation = LLQuaternion.Identity;
-
- Client.Objects.AddPrim(Client.Network.CurrentSim, linkset.RootPrim.Data, LLUUID.Zero,
- linkset.RootPrim.Position, linkset.RootPrim.Scale, linkset.RootPrim.Rotation);
-
- if (!primDone.WaitOne(10000, false))
- return "Rez failed, timed out while creating the root prim.";
-
- state = ImporterState.RezzingChildren;
-
- // Rez the child prims
- foreach (Primitive prim in linkset.Children)
- {
- currentPrim = prim;
- currentPosition = prim.Position + linkset.RootPrim.Position;
-
- Client.Objects.AddPrim(Client.Network.CurrentSim, prim.Data, LLUUID.Zero, currentPosition,
- prim.Scale, prim.Rotation);
-
- if (!primDone.WaitOne(10000, false))
- return "Rez failed, timed out while creating child prim.";
- }
-
- if (linkset.Children.Count != 0)
- {
- // Create a list of the local IDs of the newly created prims
- List primIDs = new List(primsCreated.Count);
- primIDs.Add(rootLocalID); // Root prim is first in list.
- foreach (Primitive prim in primsCreated)
- {
- if (prim.LocalID != rootLocalID)
- primIDs.Add(prim.LocalID);
- }
- linkQueue = new List(primIDs.Count);
- linkQueue.AddRange(primIDs);
-
- // Link and set the permissions + rotation
- state = ImporterState.Linking;
- Client.Objects.LinkPrims(Client.Network.CurrentSim, linkQueue);
- if (primDone.WaitOne(100000 * linkset.Children.Count, false))
- {
- Client.Objects.SetPermissions(Client.Network.CurrentSim, primIDs,
- Helpers.PermissionWho.Everyone | Helpers.PermissionWho.Group | Helpers.PermissionWho.NextOwner,
- Helpers.PermissionType.Copy | Helpers.PermissionType.Modify | Helpers.PermissionType.Move |
- Helpers.PermissionType.Transfer, true);
-
- Client.Objects.SetRotation(Client.Network.CurrentSim, rootLocalID, rootRotation);
- }
- else
- {
- Console.WriteLine("Warning: Failed to link {0} prims", linkQueue.Count);
- }
- }
- else
- {
- Client.Objects.SetRotation(Client.Network.CurrentSim, rootLocalID, rootRotation);
- }
- state = ImporterState.Idle;
- }
- else
- {
- // Skip linksets with a missing root prim
- Console.WriteLine("WARNING: Skipping a linkset with a missing root prim");
- }
-
- // Reset everything for the next linkset
- primsCreated.Clear();
- }
-
- return "Import complete.";
- }
-
- void TestClient_OnPrimCreated(Simulator simulator, Primitive prim)
- {
- if ((prim.Flags & LLObject.ObjectFlags.CreateSelected) == 0)
- return; // We received an update for an object we didn't create
-
- switch (state)
- {
- case ImporterState.RezzingParent:
- rootLocalID = prim.LocalID;
- goto case ImporterState.RezzingChildren;
- case ImporterState.RezzingChildren:
- if (!primsCreated.Contains(prim))
- {
- Console.WriteLine("Setting properties for " + prim.LocalID);
- // TODO: Is there a way to set all of this at once, and update more ObjectProperties stuff?
- currentClient.Objects.SetPosition(simulator, prim.LocalID, currentPosition);
- currentClient.Objects.SetTextures(simulator, prim.LocalID, currentPrim.Textures);
- currentClient.Objects.SetLight(simulator, prim.LocalID, currentPrim.Light);
- currentClient.Objects.SetFlexible(simulator, prim.LocalID, currentPrim.Flexible);
-
- if (!String.IsNullOrEmpty(currentPrim.Properties.Name))
- currentClient.Objects.SetName(simulator, prim.LocalID, currentPrim.Properties.Name);
- if (!String.IsNullOrEmpty(currentPrim.Properties.Description))
- currentClient.Objects.SetDescription(simulator, prim.LocalID,
- currentPrim.Properties.Description);
-
- primsCreated.Add(prim);
- primDone.Set();
- }
- break;
- case ImporterState.Linking:
- lock (linkQueue)
- {
- int index = linkQueue.IndexOf(prim.LocalID);
- if (index != -1)
- {
- linkQueue.RemoveAt(index);
- if (linkQueue.Count == 0)
- primDone.Set();
- }
- }
- break;
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/Prims/PrimCountCommand.cs b/tools/mass test client/Commands/Prims/PrimCountCommand.cs
deleted file mode 100644
index 5d07e8b056..0000000000
--- a/tools/mass test client/Commands/Prims/PrimCountCommand.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class PrimCountCommand: Command
- {
- public PrimCountCommand(TestClient testClient)
- {
- Name = "primcount";
- Description = "Shows the number of prims that have been received.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- int count = 0;
-
- lock (Client.SimPrims)
- {
- foreach (Dictionary prims in Client.SimPrims.Values)
- {
- count += prims.Count;
- }
- }
-
- return count.ToString();
- }
- }
-}
diff --git a/tools/mass test client/Commands/Stats/DilationCommand.cs b/tools/mass test client/Commands/Stats/DilationCommand.cs
deleted file mode 100644
index e6e0a4d27d..0000000000
--- a/tools/mass test client/Commands/Stats/DilationCommand.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class DilationCommand : Command
- {
- public DilationCommand(TestClient testClient)
- {
- Name = "dilation";
- Description = "Shows time dilation for current sim.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- return "Dilation is " + Client.Network.CurrentSim.Dilation.ToString();
- }
- }
-}
\ No newline at end of file
diff --git a/tools/mass test client/Commands/Stats/RegionInfoCommand.cs b/tools/mass test client/Commands/Stats/RegionInfoCommand.cs
deleted file mode 100644
index 750175fb6b..0000000000
--- a/tools/mass test client/Commands/Stats/RegionInfoCommand.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Text;
-using libsecondlife;
-
-namespace libsecondlife.TestClient
-{
- public class RegionInfoCommand : Command
- {
- public RegionInfoCommand(TestClient testClient)
- {
- Name = "regioninfo";
- Description = "Prints out info about all the current region";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- StringBuilder output = new StringBuilder();
- output.AppendLine(Client.Network.CurrentSim.ToString());
- output.Append("Access: ");
- output.AppendLine(Client.Network.CurrentSim.Access.ToString());
- output.Append("Flags: ");
- output.AppendLine(Client.Network.CurrentSim.Flags.ToString());
- output.Append("TerrainBase0: ");
- output.AppendLine(Client.Network.CurrentSim.TerrainBase0.ToStringHyphenated());
- output.Append("TerrainBase1: ");
- output.AppendLine(Client.Network.CurrentSim.TerrainBase1.ToStringHyphenated());
- output.Append("TerrainBase2: ");
- output.AppendLine(Client.Network.CurrentSim.TerrainBase2.ToStringHyphenated());
- output.Append("TerrainBase3: ");
- output.AppendLine(Client.Network.CurrentSim.TerrainBase3.ToStringHyphenated());
- output.Append("TerrainDetail0: ");
- output.AppendLine(Client.Network.CurrentSim.TerrainDetail0.ToStringHyphenated());
- output.Append("TerrainDetail1: ");
- output.AppendLine(Client.Network.CurrentSim.TerrainDetail1.ToStringHyphenated());
- output.Append("TerrainDetail2: ");
- output.AppendLine(Client.Network.CurrentSim.TerrainDetail2.ToStringHyphenated());
- output.Append("TerrainDetail3: ");
- output.AppendLine(Client.Network.CurrentSim.TerrainDetail3.ToStringHyphenated());
- output.Append("Water Height: ");
- output.AppendLine(Client.Network.CurrentSim.WaterHeight.ToString());
-
- return output.ToString();
- }
- }
-}
diff --git a/tools/mass test client/Commands/Stats/StatsCommand.cs b/tools/mass test client/Commands/Stats/StatsCommand.cs
deleted file mode 100644
index cf3e4e9878..0000000000
--- a/tools/mass test client/Commands/Stats/StatsCommand.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class StatsCommand : Command
- {
- public StatsCommand(TestClient testClient)
- {
- Name = "stats";
- Description = "Provide connection figures and statistics";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- StringBuilder output = new StringBuilder();
-
- lock (Client.Network.Simulators)
- {
- for (int i = 0; i < Client.Network.Simulators.Count; i++)
- {
- Simulator sim = Client.Network.Simulators[i];
-
- output.AppendLine(String.Format(
- "[{0}] Dilation: {1} InBPS: {2} OutBPS: {3} ResentOut: {4} ResentIn: {5}",
- sim.ToString(), sim.Dilation, sim.IncomingBPS, sim.OutgoingBPS, sim.ResentPackets,
- sim.ReceivedResends));
- }
- }
- output.Append("Packets in the queue: " + Client.Network.InboxCount);
- output.AppendLine(String.Format("FPS : {0} PhysicsFPS : {1} AgentUpdates : {2} Objects : {3} Scripted Objects : {4}",
- Client.Network.CurrentSim.FPS, Client.Network.CurrentSim.PhysicsFPS, Client.Network.CurrentSim.AgentUpdates, Client.Network.CurrentSim.Objects, Client.Network.CurrentSim.ScriptedObjects));
- output.AppendLine(String.Format("Frame Time : {0} Net Time : {1} Image Time : {2} Physics Time : {3} Script Time : {4} Other Time : {5}",
- Client.Network.CurrentSim.FrameTime, Client.Network.CurrentSim.NetTime, Client.Network.CurrentSim.ImageTime, Client.Network.CurrentSim.PhysicsTime, Client.Network.CurrentSim.ScriptTime, Client.Network.CurrentSim.OtherTime));
- output.AppendLine(String.Format("Agents : {0} Child Agents : {1} Active Scripts : {2}",
- Client.Network.CurrentSim.Agents, Client.Network.CurrentSim.ChildAgents, Client.Network.CurrentSim.ActiveScripts));
-
- return output.ToString();
- }
- }
-}
diff --git a/tools/mass test client/Commands/Stats/UptimeCommand.cs b/tools/mass test client/Commands/Stats/UptimeCommand.cs
deleted file mode 100644
index ac94644c9c..0000000000
--- a/tools/mass test client/Commands/Stats/UptimeCommand.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class UptimeCommand : Command
- {
- public DateTime Created = DateTime.Now;
-
- public UptimeCommand(TestClient testClient)
- {
- Name = "uptime";
- Description = "Shows the login name, login time and length of time logged on.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- string name = Client.ToString();
- return "I am " + name + ", Up Since: " + Created + " (" + (DateTime.Now - Created) + ")";
- }
- }
-}
\ No newline at end of file
diff --git a/tools/mass test client/Commands/System/DebugCommand.cs b/tools/mass test client/Commands/System/DebugCommand.cs
deleted file mode 100644
index 07e2a6c2c8..0000000000
--- a/tools/mass test client/Commands/System/DebugCommand.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class DebugCommand : Command
- {
- public DebugCommand(TestClient testClient)
- {
- Name = "debug";
- Description = "Turn debug messages on or off. Usage: debug [on/off]";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 1)
- return "Usage: debug [on/off]";
-
- if (args[0].ToLower() == "on")
- {
- Client.Settings.DEBUG = true;
- return "Debug logging is on";
- }
- else if (args[0].ToLower() == "off")
- {
- Client.Settings.DEBUG = false;
- return "Debug logging is off";
- }
- else
- {
- return "Usage: debug [on/off]";
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/System/HelpCommand.cs b/tools/mass test client/Commands/System/HelpCommand.cs
deleted file mode 100644
index a53b3c0009..0000000000
--- a/tools/mass test client/Commands/System/HelpCommand.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class HelpCommand: Command
- {
- public HelpCommand(TestClient testClient)
- {
- Name = "help";
- Description = "Lists available commands.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- StringBuilder result = new StringBuilder();
- result.AppendFormat("\n\nHELP\nClient accept teleport lures from master and group members.\n");
- foreach (Command c in Client.Commands.Values)
- {
- result.AppendFormat(" * {0} - {1}\n", c.Name, c.Description);
- }
-
- return result.ToString();
- }
- }
-}
diff --git a/tools/mass test client/Commands/System/LoadCommand.cs b/tools/mass test client/Commands/System/LoadCommand.cs
deleted file mode 100644
index 24d22196f6..0000000000
--- a/tools/mass test client/Commands/System/LoadCommand.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class LoadCommand: Command
- {
- public LoadCommand(TestClient testClient)
- {
- Name = "load";
- Description = "Loads commands from a dll. (Usage: load AssemblyNameWithoutExtension)";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length < 1)
- return "Usage: load AssemblyNameWithoutExtension";
-
- string filename = AppDomain.CurrentDomain.BaseDirectory + args[0] + ".dll";
- Client.RegisterAllCommands(Assembly.LoadFile(filename));
- return "Assembly " + filename + " loaded.";
- }
- }
-}
diff --git a/tools/mass test client/Commands/System/LoginCommand.cs b/tools/mass test client/Commands/System/LoginCommand.cs
deleted file mode 100644
index 6cfc1559db..0000000000
--- a/tools/mass test client/Commands/System/LoginCommand.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class LoginCommand : Command
- {
- public LoginCommand(TestClient testClient)
- {
- Name = "login";
- Description = "Logs in another avatar";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 3 && args.Length != 4)
- return "usage: login firstname lastname password [simname]";
-
- SecondLife newClient = Client.ClientManager.Login(args);
-
- if (newClient.Network.Connected)
- {
- return "Logged in " + newClient.ToString();
- }
- else
- {
- return "Failed to login: " + newClient.Network.LoginMessage;
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/System/LogoutCommand.cs b/tools/mass test client/Commands/System/LogoutCommand.cs
deleted file mode 100644
index 8241626db1..0000000000
--- a/tools/mass test client/Commands/System/LogoutCommand.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class LogoutCommand : Command
- {
- public LogoutCommand(TestClient testClient)
- {
- Name = "logout";
- Description = "Log this avatar out";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- string name = Client.ToString();
- Client.ClientManager.Logout(Client);
- return "Logged " + name + " out";
- }
- }
-}
diff --git a/tools/mass test client/Commands/System/MD5Command.cs b/tools/mass test client/Commands/System/MD5Command.cs
deleted file mode 100644
index 2084e67ec7..0000000000
--- a/tools/mass test client/Commands/System/MD5Command.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using libsecondlife;
-
-namespace libsecondlife.TestClient
-{
- public class MD5Command : Command
- {
- public MD5Command(TestClient testClient)
- {
- Name = "md5";
- Description = "Creates an MD5 hash from a given password. Usage: md5 [password]";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length == 1)
- return Helpers.MD5(args[0]);
- else
- return "Usage: md5 [password]";
- }
- }
-}
diff --git a/tools/mass test client/Commands/System/PacketLogCommand.cs b/tools/mass test client/Commands/System/PacketLogCommand.cs
deleted file mode 100644
index 694cee16bb..0000000000
--- a/tools/mass test client/Commands/System/PacketLogCommand.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Xml;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class PacketLogCommand : Command
- {
- List Packets = new List();
- bool Done = false;
- int Count = 0;
- int Total = 0;
-
- public PacketLogCommand(TestClient testClient)
- {
- Name = "packetlog";
- Description = "Logs a given number of packets to an xml file. Usage: packetlog 10 tenpackets.xml";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length != 2)
- return "Usage: packetlog 10 tenpackets.xml";
-
- XmlWriter writer;
- NetworkManager.PacketCallback callback = new NetworkManager.PacketCallback(OnPacket);
-
- Packets.Clear();
- Done = false;
- Count = 0;
-
- try
- {
- Total = Int32.Parse(args[0]);
- writer = XmlWriter.Create(args[1]);
-
- Client.Network.RegisterCallback(PacketType.Default, callback);
- }
- catch (Exception e)
- {
- return "Usage: packetlog 10 tenpackets.xml (" + e + ")";
- }
-
- while (!Done)
- {
- System.Threading.Thread.Sleep(100);
- }
-
- Client.Network.UnregisterCallback(PacketType.Default, callback);
-
- try
- {
- Helpers.PacketListToXml(Packets, writer);
- }
- catch (Exception e)
- {
- return "Serialization failed: " + e.ToString();
- }
-
- writer.Close();
- Packets.Clear();
-
- return "Exported " + Count + " packets to " + args[1];
- }
-
- private void OnPacket(Packet packet, Simulator simulator)
- {
- lock (Packets)
- {
- if (Count >= Total)
- {
- Done = true;
- }
- else
- {
- Packets.Add(packet);
- Count++;
- }
- }
- }
- }
-}
diff --git a/tools/mass test client/Commands/System/QuitCommand.cs b/tools/mass test client/Commands/System/QuitCommand.cs
deleted file mode 100644
index 2cf0418ce7..0000000000
--- a/tools/mass test client/Commands/System/QuitCommand.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class QuitCommand: Command
- {
- public QuitCommand(TestClient testClient)
- {
- Name = "quit";
- Description = "Log all avatars out and shut down";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- Client.ClientManager.LogoutAll();
- Client.ClientManager.Running = false;
- return "All avatars logged out";
- }
- }
-}
diff --git a/tools/mass test client/Commands/System/SetMasterCommand.cs b/tools/mass test client/Commands/System/SetMasterCommand.cs
deleted file mode 100644
index 8601865e6f..0000000000
--- a/tools/mass test client/Commands/System/SetMasterCommand.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class SetMasterCommand: Command
- {
- public DateTime Created = DateTime.Now;
- private LLUUID resolvedMasterKey = LLUUID.Zero;
- private ManualResetEvent keyResolution = new ManualResetEvent(false);
- private LLUUID query = LLUUID.Zero;
-
- public SetMasterCommand(TestClient testClient)
- {
- Name = "setMaster";
- Description = "Sets the user name of the master user. The master user can IM to run commands.";
-
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- string masterName = String.Empty;
- for (int ct = 0; ct < args.Length;ct++)
- masterName = masterName + args[ct] + " ";
- masterName = masterName.TrimEnd();
-
- if (masterName.Length == 0)
- return "Usage setMaster name";
-
- DirectoryManager.DirPeopleReplyCallback callback = new DirectoryManager.DirPeopleReplyCallback(KeyResolvHandler);
- Client.Directory.OnDirPeopleReply += callback;
- query = Client.Directory.StartPeopleSearch(DirectoryManager.DirFindFlags.People, masterName, 0);
- if (keyResolution.WaitOne(TimeSpan.FromMinutes(1), false))
- {
- Client.MasterKey = resolvedMasterKey;
- keyResolution.Reset();
- Client.Directory.OnDirPeopleReply -= callback;
- }
- else
- {
- keyResolution.Reset();
- Client.Directory.OnDirPeopleReply -= callback;
- return "Unable to obtain UUID for \"" + masterName + "\". Master unchanged.";
- }
-
-
- foreach (Avatar av in Client.AvatarList.Values)
- {
- if (av.ID == Client.MasterKey)
- {
- Client.Self.InstantMessage(av.ID, "You are now my master. IM me with \"help\" for a command list.");
- break;
- }
- }
-
- return "Master set to " + masterName + " (" + Client.MasterKey.ToStringHyphenated() + ")";
- }
-
- private void KeyResolvHandler(LLUUID queryid, List matches)
- {
- if (query != queryid)
- return;
- // We can't handle ambiguities here as nicely as we can in ClientManager.
- resolvedMasterKey = matches[0].AgentID;
- keyResolution.Set();
- query = LLUUID.Zero;
- }
- }
-}
diff --git a/tools/mass test client/Commands/System/SetMasterKeyCommand.cs b/tools/mass test client/Commands/System/SetMasterKeyCommand.cs
deleted file mode 100644
index 1fa6336ebe..0000000000
--- a/tools/mass test client/Commands/System/SetMasterKeyCommand.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class SetMasterKeyCommand : Command
- {
- public DateTime Created = DateTime.Now;
-
- public SetMasterKeyCommand(TestClient testClient)
- {
- Name = "setMasterKey";
- Description = "Sets the key of the master user. The master user can IM to run commands.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- Client.MasterKey = LLUUID.Parse(args[0]);
-
- foreach (Avatar av in Client.AvatarList.Values)
- {
- if (av.ID == Client.MasterKey)
- {
- Client.Self.InstantMessage(av.ID, "You are now my master. IM me with \"help\" for a command list.");
- break;
- }
- }
-
- return "Master set to " + Client.MasterKey;
- }
- }
-}
diff --git a/tools/mass test client/Commands/System/ShowEffectsCommand.cs b/tools/mass test client/Commands/System/ShowEffectsCommand.cs
deleted file mode 100644
index 4d46e35aa3..0000000000
--- a/tools/mass test client/Commands/System/ShowEffectsCommand.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using libsecondlife;
-
-namespace libsecondlife.TestClient
-{
- public class ShowEffectsCommand : Command
- {
- bool ShowEffects = false;
-
- public ShowEffectsCommand(TestClient testClient)
- {
- Name = "showeffects";
- Description = "Prints out information for every viewer effect that is received. Usage: showeffects [on/off]";
-
- testClient.Avatars.OnEffect += new AvatarManager.EffectCallback(Avatars_OnEffect);
- testClient.Avatars.OnLookAt += new AvatarManager.LookAtCallback(Avatars_OnLookAt);
- testClient.Avatars.OnPointAt += new AvatarManager.PointAtCallback(Avatars_OnPointAt);
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length == 0)
- {
- ShowEffects = true;
- return "Viewer effects will be shown on the console";
- }
- else if (args.Length == 1)
- {
- if (args[0] == "on")
- {
- ShowEffects = true;
- return "Viewer effects will be shown on the console";
- }
- else
- {
- ShowEffects = false;
- return "Viewer effects will not be shown";
- }
- }
- else
- {
- return "Usage: showeffects [on/off]";
- }
- }
-
- private void Avatars_OnPointAt(LLUUID sourceID, LLUUID targetID, LLVector3d targetPos,
- MainAvatar.PointAtType pointType, float duration, LLUUID id)
- {
- if (ShowEffects)
- Console.WriteLine(
- "ViewerEffect [PointAt]: SourceID: {0} TargetID: {1} TargetPos: {2} Type: {3} Duration: {4} ID: {5}",
- sourceID.ToStringHyphenated(), targetID.ToStringHyphenated(), targetPos, pointType, duration,
- id.ToStringHyphenated());
- }
-
- private void Avatars_OnLookAt(LLUUID sourceID, LLUUID targetID, LLVector3d targetPos,
- MainAvatar.LookAtType lookType, float duration, LLUUID id)
- {
- if (ShowEffects)
- Console.WriteLine(
- "ViewerEffect [LookAt]: SourceID: {0} TargetID: {1} TargetPos: {2} Type: {3} Duration: {4} ID: {5}",
- sourceID.ToStringHyphenated(), targetID.ToStringHyphenated(), targetPos, lookType, duration,
- id.ToStringHyphenated());
- }
-
- private void Avatars_OnEffect(MainAvatar.EffectType type, LLUUID sourceID, LLUUID targetID,
- LLVector3d targetPos, float duration, LLUUID id)
- {
- if (ShowEffects)
- Console.WriteLine(
- "ViewerEffect [{0}]: SourceID: {1} TargetID: {2} TargetPos: {3} Duration: {4} ID: {5}",
- type, sourceID.ToStringHyphenated(), targetID.ToStringHyphenated(), targetPos, duration,
- id.ToStringHyphenated());
- }
- }
-}
diff --git a/tools/mass test client/Commands/TouchCommand.cs b/tools/mass test client/Commands/TouchCommand.cs
deleted file mode 100644
index f585b87d3d..0000000000
--- a/tools/mass test client/Commands/TouchCommand.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class TouchCommand: Command
- {
- public TouchCommand(TestClient testClient)
- {
- Name = "touch";
- Description = "Attempt to touch a prim with specified UUID";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- Primitive target = null;
-
- lock (Client.SimPrims)
- {
- if (Client.SimPrims.ContainsKey(Client.Network.CurrentSim))
- {
- foreach (Primitive p in Client.SimPrims[Client.Network.CurrentSim].Values)
- {
- if (args.Length == 0)
- return "You must specify a UUID of the prim.";
-
- try
- {
- if (p.ID == args[0])
- target = p;
- }
- catch
- {
- // handle exception
- return "Sorry, I don't think " + args[0] + " is a valid UUID. I'm unable to touch it.";
- }
- }
- }
- }
-
- if (target != null)
- {
- Client.Self.Touch(target.LocalID);
- return "Touched prim " + target.ID + ".";
- }
- else
- {
- return "Couldn't find that prim.";
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tools/mass test client/Commands/TreeCommand.cs b/tools/mass test client/Commands/TreeCommand.cs
deleted file mode 100644
index 60cf234edf..0000000000
--- a/tools/mass test client/Commands/TreeCommand.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class TreeCommand: Command
- {
- public TreeCommand(TestClient testClient)
- {
- Name = "tree";
- Description = "Rez a tree.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- if (args.Length == 1)
- {
- try
- {
- string treeName = args[0].Trim(new char[] { ' ' });
- ObjectManager.Tree tree = (ObjectManager.Tree)Enum.Parse(typeof(ObjectManager.Tree), treeName);
-
- LLVector3 treePosition = new LLVector3(Client.Self.Position.X, Client.Self.Position.Y,
- Client.Self.Position.Z);
- treePosition.Z += 3.0f;
-
- Client.Objects.AddTree(Client.Network.CurrentSim, new LLVector3(0.5f, 0.5f, 0.5f),
- LLQuaternion.Identity, treePosition, tree, Client.GroupID, false);
-
- return "Attempted to rez a " + treeName + " tree";
- }
- catch (Exception)
- {
- return "Type !tree for usage";
- }
- }
-
- string usage = "Usage: !tree [";
- foreach (string value in Enum.GetNames(typeof(ObjectManager.Tree)))
- {
- usage += value + ",";
- }
- usage = usage.TrimEnd(new char[] { ',' });
- usage += "]";
- return usage;
- }
- }
-}
diff --git a/tools/mass test client/Commands/WhoCommand.cs b/tools/mass test client/Commands/WhoCommand.cs
deleted file mode 100644
index 3edb649a42..0000000000
--- a/tools/mass test client/Commands/WhoCommand.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-
-namespace libsecondlife.TestClient
-{
- public class WhoCommand: Command
- {
- public WhoCommand(TestClient testClient)
- {
- Name = "who";
- Description = "Lists seen avatars.";
- }
-
- public override string Execute(string[] args, LLUUID fromAgentID)
- {
- StringBuilder result = new StringBuilder();
- foreach (Avatar av in Client.AvatarList.Values)
- {
- result.AppendFormat("\n{0} {1} {2}/{3} ID: {4}", av.Name, av.GroupName,
- (av.CurrentSim != null ? av.CurrentSim.Name : String.Empty), av.Position, av.ID);
- }
-
- return result.ToString();
- }
- }
-}
diff --git a/tools/mass test client/MassTestClient.csproj b/tools/mass test client/MassTestClient.csproj
deleted file mode 100644
index e97a72fa68..0000000000
--- a/tools/mass test client/MassTestClient.csproj
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
- Debug
- AnyCPU
- 8.0.50727
- 2.0
- {B87682F6-B2D7-4C4D-A529-400C24FD4880}
- Exe
- Properties
- libsecondlife.MassTestClient
- MassTestClient
-
-
- true
- full
- false
- ..\..\bin\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\
- TRACE
- prompt
- 4
-
-
-
- False
- bin\libsecondlife.dll
-
-
- False
- bin\libsecondlife.Utilities.dll
-
-
- False
- bin\openjpegnet.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Code
-
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tools/mass test client/MassTestClient.csproj.user b/tools/mass test client/MassTestClient.csproj.user
deleted file mode 100644
index c32889ca9e..0000000000
--- a/tools/mass test client/MassTestClient.csproj.user
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tools/mass test client/MassTestClient.sln b/tools/mass test client/MassTestClient.sln
deleted file mode 100644
index cbbeef6c80..0000000000
--- a/tools/mass test client/MassTestClient.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MassTestClient", "MassTestClient.csproj", "{B87682F6-B2D7-4C4D-A529-400C24FD4880}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B87682F6-B2D7-4C4D-A529-400C24FD4880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B87682F6-B2D7-4C4D-A529-400C24FD4880}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B87682F6-B2D7-4C4D-A529-400C24FD4880}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B87682F6-B2D7-4C4D-A529-400C24FD4880}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/tools/mass test client/MassTestClient.suo b/tools/mass test client/MassTestClient.suo
deleted file mode 100644
index 4b508d5a30..0000000000
Binary files a/tools/mass test client/MassTestClient.suo and /dev/null differ
diff --git a/tools/mass test client/Parsing.cs b/tools/mass test client/Parsing.cs
deleted file mode 100644
index 371c3cd9aa..0000000000
--- a/tools/mass test client/Parsing.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace libsecondlife.TestClient {
- class Parsing {
- public static string[] ParseArguments(string str) {
- List list = new List();
- string current = "";
- string trimmed = null;
- bool withinQuote = false;
- bool escaped = false;
- foreach (char c in str) {
- if (c == '"') {
- if (escaped) {
- current += '"';
- escaped = false;
- } else {
- current += '"';
- withinQuote = !withinQuote;
- }
- } else if (c == ' ' || c == '\t') {
- if (escaped || withinQuote) {
- current += c;
- escaped = false;
- } else {
- trimmed = current.Trim();
- if (trimmed.StartsWith("\"") && trimmed.EndsWith("\"")) {
- trimmed = trimmed.Remove(0, 1);
- trimmed = trimmed.Remove(trimmed.Length - 1);
- trimmed = trimmed.Trim();
- }
- if (trimmed.Length > 0)
- list.Add(trimmed);
- current = "";
- }
- } else if (c == '\\') {
- if (escaped) {
- current += '\\';
- escaped = false;
- } else {
- escaped = true;
- }
- } else {
- if (escaped)
- throw new FormatException(c.ToString() + " is not an escapable character.");
- current += c;
- }
- }
- trimmed = current.Trim();
- if (trimmed.StartsWith("\"") && trimmed.EndsWith("\"")) {
- trimmed = trimmed.Remove(0, 1);
- trimmed = trimmed.Remove(trimmed.Length - 1);
- trimmed = trimmed.Trim();
- }
- if (trimmed.Length > 0)
- list.Add(trimmed);
- return list.ToArray();
- }
- }
-}
diff --git a/tools/mass test client/Program.cs b/tools/mass test client/Program.cs
deleted file mode 100644
index bc30a1c5b4..0000000000
--- a/tools/mass test client/Program.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using CommandLine.Utility;
-
-namespace libsecondlife.TestClient
-{
- public class CommandLineArgumentsException : Exception
- {
- }
-
- public class Program
- {
-
- private static void Usage()
- {
- Console.WriteLine("Usage: " + Environment.NewLine +
- "MassTestClient.exe --first \"firstname\" --last \"lastname\" --pass \"password\" --contact \"youremail\" [--startpos \"sim/x/y/z\"] [--master \"master name\"] [--masterkey \"master uuid\"] [--loginuri] [--masscommandfile \"filename\"]" +
- Environment.NewLine + Environment.NewLine + "MassTestClient.exe --loginfile \"filename\" --contact \"youremail\" [--master \"master name\"] [--masterkey \"master uuid\"] [--loginuri] [--masscommandfile \"filename\"]");
- Console.ReadLine();
- }
-
- private static List getMassTestCommands()
- {
- List givenCommands = new List();
- Console.WriteLine("Please enter mass test commands to run in an infinite loop. Press enter to end the current command. Entering a blank command represents that you are done.");
- Console.WriteLine("");
-
- int curCommand = 0;
- string lastCommand = "NULL";
- while (lastCommand.Length > 0)
- {
- Console.Write("Command #" + curCommand + ">");
- lastCommand = Console.ReadLine().Trim();
- if (lastCommand.Length > 0)
- {
- givenCommands.Add(lastCommand);
- curCommand++;
- }
- }
-
- return givenCommands;
- }
-
- static void Main(string[] args)
- {
- Arguments arguments = new Arguments(args);
-
- ClientManager manager;
- List accounts = new List();
- LoginDetails account;
- string masterName = String.Empty;
- LLUUID masterKey = LLUUID.Zero;
- string file = String.Empty;
- string contact = String.Empty;
- string loginURI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi";
-
- try
- {
- if (arguments["masterkey"] != null)
- {
- masterKey = LLUUID.Parse(arguments["masterkey"]);
- }
-
- if (arguments["master"] != null)
- {
- masterName = arguments["master"];
- }
-
- if (arguments["contact"] == null)
- throw new CommandLineArgumentsException();
-
- contact = arguments["contact"];
-
- if (arguments["loginfile"] != null)
- {
- file = arguments["loginfile"];
-
- // Loading names from a file
- try
- {
- using (StreamReader reader = new StreamReader(file))
- {
- string line;
- int lineNumber = 0;
-
- while ((line = reader.ReadLine()) != null)
- {
- lineNumber++;
- string[] tokens = line.Trim().Split(new char[] { ' ', ',' });
-
- if (tokens.Length >= 3)
- {
- account = new LoginDetails();
- account.FirstName = tokens[0];
- account.LastName = tokens[1];
- account.Password = tokens[2];
-
- accounts.Add(account);
-
- // Leaving this out until we have per-account masters (if that
- // is desirable). For now the command-line option can
- // specify the single master that TestClient supports
-
- //if (tokens.Length == 5)
- //{
- // master = tokens[3] + " " + tokens[4];
- //}
- }
- else
- {
- Console.WriteLine("Invalid data on line " + lineNumber +
- ", must be in the format of: FirstName LastName Password");
- }
- }
- }
- }
- catch (Exception e)
- {
- Console.WriteLine("Error reading from " + args[1]);
- Console.WriteLine(e.ToString());
- Console.ReadLine();
- return;
- }
- }
- else if (arguments["first"] != null && arguments["last"] != null && arguments["pass"] != null)
- {
- // Taking a single login off the command-line
- account = new LoginDetails();
- account.FirstName = arguments["first"];
- account.LastName = arguments["last"];
- account.Password = arguments["pass"];
-
- accounts.Add(account);
- }
- else
- {
- throw new CommandLineArgumentsException();
- }
- }
-
- catch (CommandLineArgumentsException)
- {
- Usage();
- return;
- }
-
- if (arguments["loginuri"] != null)
- {
- Console.WriteLine("Please enter a login uri. If you enter nothing, AGNI grid is assumed:");
- string temp = Console.ReadLine();
- if (temp.Trim().Length > 0)
- {
- loginURI = temp.Trim();
- }
- }
-
- List massTestCommands = new List();
- if (arguments["masscommandfile"] != null)
- {
- string massCommandFile = arguments["masscommandfile"];
- try
- {
- using (StreamReader reader = new StreamReader(massCommandFile))
- {
- string line;
-
- while ((line = reader.ReadLine()) != null)
- {
-
- line = line.Trim();
- if (line.Length > 0)
- {
- massTestCommands.Add(line);
- }
- }
- }
- }
- catch (Exception e)
- {
- Console.WriteLine("Error reading from " + args[1]);
- Console.WriteLine(e.ToString());
- Console.ReadLine();
- return;
- }
- }
- else
- {
- Console.Clear();
- massTestCommands = getMassTestCommands();
- }
-
- Console.Clear();
- if (massTestCommands.Count == 0)
- {
- Console.WriteLine("No mass commands entered; Normal 'TestClient' operation will be used");
- }
- else
- {
- Console.WriteLine("Detected " + massTestCommands.Count + " mass commands; MassTestClient operation will be used");
- }
-
- Console.WriteLine(loginURI);
- foreach (LoginDetails a in accounts)
- {
- a.MasterName = masterName;
- a.MasterKey = masterKey;
- a.LoginURI = loginURI;
- }
-
- // Login the accounts and run the input loop
- if (arguments["startpos"] != null)
- {
- manager = new ClientManager(accounts, contact, arguments["startpos"]);
- }
- else
- {
- manager = new ClientManager(accounts, contact);
- }
-
-
- manager.Run(massTestCommands);
- }
- }
-}
diff --git a/tools/mass test client/Properties/AssemblyInfo.cs b/tools/mass test client/Properties/AssemblyInfo.cs
deleted file mode 100644
index ae311f437f..0000000000
--- a/tools/mass test client/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MassTestClient")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MassTestClient")]
-[assembly: AssemblyCopyright("Copyright © 2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("0563f706-7fa9-42f6-bf23-c6acd1175964")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tools/mass test client/TestClient.build b/tools/mass test client/TestClient.build
deleted file mode 100644
index 803377b352..0000000000
--- a/tools/mass test client/TestClient.build
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/mass test client/TestClient.cs b/tools/mass test client/TestClient.cs
deleted file mode 100644
index cee218c50d..0000000000
--- a/tools/mass test client/TestClient.cs
+++ /dev/null
@@ -1,324 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Xml;
-using libsecondlife;
-using libsecondlife.Packets;
-using libsecondlife.AssetSystem;
-
-namespace libsecondlife.TestClient
-{
- public class TestClient : SecondLife
- {
- public delegate void PrimCreatedCallback(Simulator simulator, Primitive prim);
-
- public event PrimCreatedCallback OnPrimCreated;
-
- public Dictionary> SimPrims;
- public LLUUID GroupID = LLUUID.Zero;
- public Dictionary GroupMembers;
- public Dictionary AvatarList = new Dictionary();
- public Dictionary Appearances = new Dictionary();
- public Dictionary Commands = new Dictionary();
- public bool Running = true;
- public string MasterName = String.Empty;
- public LLUUID MasterKey = LLUUID.Zero;
- public ClientManager ClientManager;
- public int regionX;
- public int regionY;
-
- //internal libsecondlife.InventorySystem.InventoryFolder currentDirectory;
-
- private System.Timers.Timer updateTimer;
-
-
- ///
- ///
- ///
- public TestClient(ClientManager manager)
- {
- ClientManager = manager;
-
- updateTimer = new System.Timers.Timer(1000);
- updateTimer.Elapsed += new System.Timers.ElapsedEventHandler(updateTimer_Elapsed);
-
- RegisterAllCommands(Assembly.GetExecutingAssembly());
-
- Settings.DEBUG = true;
- Settings.STORE_LAND_PATCHES = true;
- Settings.ALWAYS_REQUEST_OBJECTS = true;
-
- Network.RegisterCallback(PacketType.AgentDataUpdate, new NetworkManager.PacketCallback(AgentDataUpdateHandler));
-
- Objects.OnNewPrim += new ObjectManager.NewPrimCallback(Objects_OnNewPrim);
- Objects.OnObjectUpdated += new ObjectManager.ObjectUpdatedCallback(Objects_OnObjectUpdated);
- Objects.OnObjectKilled += new ObjectManager.KillObjectCallback(Objects_OnObjectKilled);
- Objects.OnNewAvatar += new ObjectManager.NewAvatarCallback(Objects_OnNewAvatar);
- Self.OnInstantMessage += new MainAvatar.InstantMessageCallback(Self_OnInstantMessage);
- Groups.OnGroupMembers += new GroupManager.GroupMembersCallback(GroupMembersHandler);
- this.OnLogMessage += new LogCallback(TestClient_OnLogMessage);
-
- Network.RegisterCallback(PacketType.AvatarAppearance, new NetworkManager.PacketCallback(AvatarAppearanceHandler));
-
- updateTimer.Start();
- }
-
- public void RegisterAllCommands(Assembly assembly)
- {
- foreach (Type t in assembly.GetTypes())
- {
- try
- {
- if (t.IsSubclassOf(typeof(Command)))
- {
- ConstructorInfo info = t.GetConstructor(new Type[] { typeof(TestClient) });
- Command command = (Command)info.Invoke(new object[] { this });
- RegisterCommand(command);
- }
- }
- catch (Exception e)
- {
- Console.WriteLine(e.ToString());
- }
- }
- }
-
- public void RegisterCommand(Command command)
- {
- command.Client = this;
- if (!Commands.ContainsKey(command.Name.ToLower()))
- {
- Commands.Add(command.Name.ToLower(), command);
- }
- }
-
- //breaks up large responses to deal with the max IM size
- private void SendResponseIM(SecondLife client, LLUUID fromAgentID, string data, LLUUID imSessionID)
- {
- for ( int i = 0 ; i < data.Length ; i += 1024 ) {
- int y;
- if ((i + 1023) > data.Length)
- {
- y = data.Length - i;
- }
- else
- {
- y = 1023;
- }
- string message = data.Substring(i, y);
- client.Self.InstantMessage(fromAgentID, message, imSessionID);
- }
- }
-
- public void DoCommand(string cmd, LLUUID fromAgentID, LLUUID imSessionID)
- {
- string[] tokens = Parsing.ParseArguments(cmd);
-
- if (tokens.Length == 0)
- return;
-
- string firstToken = tokens[0].ToLower();
-
- // "all balance" will send the balance command to all currently logged in bots
- if (firstToken == "all" && tokens.Length > 1)
- {
- cmd = String.Empty;
-
- // Reserialize all of the arguments except for "all"
- for (int i = 1; i < tokens.Length; i++)
- {
- cmd += tokens[i] + " ";
- }
-
- ClientManager.DoCommandAll(cmd, fromAgentID, imSessionID);
-
- return;
- }
-
- if (Commands.ContainsKey(firstToken))
- {
- string[] args = new string[tokens.Length - 1];
- Array.Copy(tokens, 1, args, 0, args.Length);
- string response = Commands[firstToken].Execute(args, fromAgentID);
-
- if (response.Length > 0)
- {
- Console.WriteLine(response);
-
- if (fromAgentID != null && Network.Connected)
- {
- // IMs don't like \r\n line endings, clean them up first
- response = response.Replace("\r", "");
- SendResponseIM(this, fromAgentID, response, imSessionID);
- }
- }
- }
- }
-
- private void updateTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
- {
- foreach (Command c in Commands.Values)
- if (c.Active)
- c.Think();
- }
-
- private void AgentDataUpdateHandler(Packet packet, Simulator sim)
- {
- AgentDataUpdatePacket p = (AgentDataUpdatePacket)packet;
- if (p.AgentData.AgentID == sim.Client.Network.AgentID)
- {
- Console.WriteLine("Got the group ID for " + sim.Client.ToString() + ", requesting group members...");
- GroupID = p.AgentData.ActiveGroupID;
-
- sim.Client.Groups.BeginGetGroupMembers(GroupID);
- }
- }
-
- private void TestClient_OnLogMessage(string message, Helpers.LogLevel level)
- {
- Console.WriteLine("<" + this.ToString() + "> " + level.ToString() + ": " + message);
- }
-
- private void GroupMembersHandler(Dictionary members)
- {
- Console.WriteLine("Got " + members.Count + " group members.");
- GroupMembers = members;
- }
-
- private void Objects_OnObjectKilled(Simulator simulator, uint objectID)
- {
- lock (SimPrims)
- {
- if (SimPrims.ContainsKey(simulator) && SimPrims[simulator].ContainsKey(objectID))
- SimPrims[simulator].Remove(objectID);
- }
-
- lock (AvatarList)
- {
- if (AvatarList.ContainsKey(objectID))
- AvatarList.Remove(objectID);
- }
- }
-
- private void Objects_OnObjectUpdated(Simulator simulator, ObjectUpdate update, ulong regionHandle, ushort timeDilation)
- {
- regionX = (int)(regionHandle >> 32);
- regionY = (int)(regionHandle & 0xFFFFFFFF);
-
- if (update.Avatar)
- {
- lock (AvatarList)
- {
- // TODO: We really need a solid avatar and object tracker in Utilities to use here
- if (AvatarList.ContainsKey(update.LocalID))
- {
- AvatarList[update.LocalID].CollisionPlane = update.CollisionPlane;
- AvatarList[update.LocalID].Position = update.Position;
- AvatarList[update.LocalID].Velocity = update.Velocity;
- AvatarList[update.LocalID].Acceleration = update.Acceleration;
- AvatarList[update.LocalID].Rotation = update.Rotation;
- AvatarList[update.LocalID].AngularVelocity = update.AngularVelocity;
- AvatarList[update.LocalID].Textures = update.Textures;
- }
- }
- }
- else
- {
- lock (SimPrims)
- {
- if (SimPrims.ContainsKey(simulator) && SimPrims[simulator].ContainsKey(update.LocalID))
- {
- SimPrims[simulator][update.LocalID].Position = update.Position;
- SimPrims[simulator][update.LocalID].Velocity = update.Velocity;
- SimPrims[simulator][update.LocalID].Acceleration = update.Acceleration;
- SimPrims[simulator][update.LocalID].Rotation = update.Rotation;
- SimPrims[simulator][update.LocalID].AngularVelocity = update.AngularVelocity;
- SimPrims[simulator][update.LocalID].Textures = update.Textures;
- }
- }
- }
- }
-
- private void Objects_OnNewPrim(Simulator simulator, Primitive prim, ulong regionHandle, ushort timeDilation)
- {
- lock (SimPrims)
- {
- if (!SimPrims.ContainsKey(simulator))
- {
- SimPrims[simulator] = new Dictionary(10000);
- }
-
- SimPrims[simulator][prim.LocalID] = prim;
- }
-
- if ((prim.Flags & LLObject.ObjectFlags.CreateSelected) != 0 && OnPrimCreated != null)
- {
- OnPrimCreated(simulator, prim);
- }
- }
-
- private void Objects_OnNewAvatar(Simulator simulator, Avatar avatar, ulong regionHandle, ushort timeDilation)
- {
- lock (AvatarList)
- {
- AvatarList[avatar.LocalID] = avatar;
- }
- }
-
- private void AvatarAppearanceHandler(Packet packet, Simulator simulator)
- {
- AvatarAppearancePacket appearance = (AvatarAppearancePacket)packet;
-
- lock (Appearances) Appearances[appearance.Sender.ID] = appearance;
- }
-
- private void Self_OnInstantMessage(LLUUID fromAgentID, string fromAgentName, LLUUID toAgentID,
- uint parentEstateID, LLUUID regionID, LLVector3 position, MainAvatar.InstantMessageDialog dialog,
- bool groupIM, LLUUID imSessionID, DateTime timestamp, string message,
- MainAvatar.InstantMessageOnline offline, byte[] binaryBucket)
- {
- if (MasterKey != LLUUID.Zero)
- {
- if (fromAgentID != MasterKey)
- {
- // Received an IM from someone that is not the bot's master, ignore
- Console.WriteLine("" + fromAgentName + " (not master): " + message + "@" + regionID.ToString() + ":" + position.ToString() );
- return;
- }
- }
- else
- {
- if (GroupMembers != null && !GroupMembers.ContainsKey(fromAgentID))
- {
- // Received an IM from someone outside the bot's group, ignore
- Console.WriteLine("" + fromAgentName + " (not in group): " + message + "@" + regionID.ToString() + ":" + position.ToString());
- return;
- }
- }
-
- Console.WriteLine("" + fromAgentName + ": " + message);
-
- if (dialog == MainAvatar.InstantMessageDialog.RequestTeleport)
- {
- Console.WriteLine("Accepting teleport lure.");
- Self.TeleportLureRespond(fromAgentID, true);
- }
- else
- {
- if (dialog == MainAvatar.InstantMessageDialog.InventoryOffered)
- {
- Console.WriteLine("Accepting inventory offer.");
-
- Self.InstantMessage(Self.FirstName + " " + Self.LastName, fromAgentID, String.Empty,
- imSessionID, MainAvatar.InstantMessageDialog.InventoryAccepted,
- MainAvatar.InstantMessageOnline.Offline, Self.Position, LLUUID.Zero,
- Self.InventoryRootFolderUUID.GetBytes());
- }
- else
- {
- DoCommand(message, fromAgentID, imSessionID);
- }
- }
- }
- }
-}
diff --git a/tools/mass test client/bin/libsecondlife.Utilities.dll b/tools/mass test client/bin/libsecondlife.Utilities.dll
deleted file mode 100644
index b5a71fcf65..0000000000
Binary files a/tools/mass test client/bin/libsecondlife.Utilities.dll and /dev/null differ
diff --git a/tools/mass test client/bin/libsecondlife.dll b/tools/mass test client/bin/libsecondlife.dll
deleted file mode 100644
index 60c3151862..0000000000
Binary files a/tools/mass test client/bin/libsecondlife.dll and /dev/null differ
diff --git a/tools/mass test client/bin/openjpegnet.dll b/tools/mass test client/bin/openjpegnet.dll
deleted file mode 100644
index 83067b08fd..0000000000
Binary files a/tools/mass test client/bin/openjpegnet.dll and /dev/null differ