aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--Common-Source/OpenSim.Framework.Console/AssemblyInfo.cs (renamed from OpenSim.Framework.Console/AssemblyInfo.cs)0
-rw-r--r--Common-Source/OpenSim.Framework.Console/ConsoleBase.cs (renamed from OpenSim.Framework.Console/ConsoleBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework.Console/ConsoleCallbacksBase.cs (renamed from OpenSim.Framework.Console/ConsoleCallbacksBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework.Console/MainConsole.cs (renamed from OpenSim.Framework.Console/MainConsole.cs)0
-rw-r--r--Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj (renamed from OpenSim.Framework.Console/OpenSim.Framework.Console.csproj)0
-rw-r--r--Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user12
-rw-r--r--Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build (renamed from OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build)0
-rw-r--r--Common-Source/OpenSim.Framework/AgentInventory.cs (renamed from OpenSim.Framework/AgentInventory.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/BlockingQueue.cs (renamed from OpenSim.Framework/BlockingQueue.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/HeightMapGenHills.cs (renamed from OpenSim.Framework/HeightMapGenHills.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IAssetServer.cs (renamed from OpenSim.Framework/Interfaces/IAssetServer.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs30
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IConfig.cs (renamed from OpenSim.Framework/Interfaces/IConfig.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IGenericConfig.cs (renamed from OpenSim.Framework/Interfaces/IGenericConfig.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IGridConfig.cs (renamed from OpenSim.Framework/Interfaces/IGridConfig.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IGridServer.cs (renamed from OpenSim.Framework/Interfaces/IGridServer.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/ILocalStorage.cs (renamed from OpenSim.Framework/Interfaces/ILocalStorage.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IScriptAPI.cs (renamed from OpenSim.Framework/Interfaces/IScriptAPI.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IScriptEngine.cs (renamed from OpenSim.Framework/Interfaces/IScriptEngine.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IUserConfig.cs (renamed from OpenSim.Framework/Interfaces/IUserConfig.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IUserServer.cs (renamed from OpenSim.Framework/Interfaces/IUserServer.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/LocalGridBase.cs (renamed from OpenSim.Framework/Interfaces/LocalGridBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/RemoteGridBase.cs (renamed from OpenSim.Framework/Interfaces/RemoteGridBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/LoginService.cs (renamed from OpenSim.Framework/LoginService.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/OpenSim.Framework.csproj (renamed from OpenSim.Framework/OpenSim.Framework.csproj)37
-rw-r--r--Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user12
-rw-r--r--Common-Source/OpenSim.Framework/OpenSim.Framework.dll.build (renamed from OpenSim.Framework/OpenSim.Framework.dll.build)1
-rw-r--r--Common-Source/OpenSim.Framework/Properties/AssemblyInfo.cs (renamed from OpenSim.Framework/Properties/AssemblyInfo.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Remoting.cs (renamed from OpenSim.Framework/Remoting.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/SimProfile.cs (renamed from OpenSim.Framework/SimProfile.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/SimProfileBase.cs (renamed from OpenSim.Framework/SimProfileBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/AgentCiruitData.cs (renamed from OpenSim.Framework/Types/AgentCiruitData.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/AssetBase.cs (renamed from OpenSim.Framework/Types/AssetBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/AssetLandmark.cs (renamed from OpenSim.Framework/Types/AssetLandmark.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/AssetStorage.cs (renamed from OpenSim.Framework/Types/AssetStorage.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/Login.cs (renamed from OpenSim.Framework/Types/Login.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/NeighbourInfo.cs (renamed from OpenSim.Framework/Types/NeighbourInfo.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/OSVector3.cs (renamed from OpenSim.Framework/Types/OSVector3.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/PrimData.cs (renamed from OpenSim.Framework/Types/PrimData.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/UserProfile.cs (renamed from OpenSim.Framework/UserProfile.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/UserProfileManager.cs (renamed from OpenSim.Framework/UserProfileManager.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/UserProfileManagerBase.cs (renamed from OpenSim.Framework/UserProfileManagerBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Util.cs (renamed from OpenSim.Framework/Util.cs)0
-rw-r--r--Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj (renamed from OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj)0
-rw-r--r--Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user12
-rw-r--r--Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build (renamed from OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build)0
-rw-r--r--Common-Source/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs (renamed from OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs)0
-rw-r--r--Common-Source/OpenSim.GenericConfig/Xml/XmlConfig.cs (renamed from OpenSim.GenericConfig/Xml/XmlConfig.cs)0
-rw-r--r--Common-Source/OpenSim.Servers/BaseHttpServer.cs (renamed from OpenSim.Servers/BaseHttpServer.cs)0
-rw-r--r--Common-Source/OpenSim.Servers/BaseServer.cs (renamed from OpenSim.Servers/BaseServer.cs)0
-rw-r--r--Common-Source/OpenSim.Servers/CheckSumServer.cs (renamed from OpenSim.Servers/CheckSumServer.cs)0
-rw-r--r--Common-Source/OpenSim.Servers/IRestHandler.cs (renamed from OpenSim.Servers/IRestHandler.cs)0
-rw-r--r--Common-Source/OpenSim.Servers/LocalUserProfileManager.cs (renamed from OpenSim.Servers/LocalUserProfileManager.cs)0
-rw-r--r--Common-Source/OpenSim.Servers/LoginResponse.cs (renamed from OpenSim.Servers/LoginResponse.cs)0
-rw-r--r--Common-Source/OpenSim.Servers/LoginServer.cs (renamed from OpenSim.Servers/LoginServer.cs)0
-rw-r--r--Common-Source/OpenSim.Servers/OpenSim.Servers.csproj (renamed from OpenSim.Servers/OpenSim.Servers.csproj)0
-rw-r--r--Common-Source/OpenSim.Servers/OpenSim.Servers.csproj.user12
-rw-r--r--Common-Source/OpenSim.Servers/OpenSim.Servers.dll.build (renamed from OpenSim.Servers/OpenSim.Servers.dll.build)0
-rw-r--r--Common-Source/OpenSim.Servers/UDPServerBase.cs (renamed from OpenSim.Servers/UDPServerBase.cs)0
-rw-r--r--Common-Source/OpenSim.Servers/XmlRpcMethod.cs (renamed from OpenSim.Servers/XmlRpcMethod.cs)0
-rw-r--r--Common-Source/XmlRpcCS/Logger.cs (renamed from XmlRpcCS/Logger.cs)0
-rw-r--r--Common-Source/XmlRpcCS/SimpleHttpRequest.cs (renamed from XmlRpcCS/SimpleHttpRequest.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XMLRPC.csproj (renamed from XmlRpcCS/XMLRPC.csproj)0
-rw-r--r--Common-Source/XmlRpcCS/XMLRPC.csproj.user12
-rw-r--r--Common-Source/XmlRpcCS/XMLRPC.dll.build (renamed from XmlRpcCS/XMLRPC.dll.build)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcBoxcarRequest.cs (renamed from XmlRpcCS/XmlRpcBoxcarRequest.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcClientProxy.cs (renamed from XmlRpcCS/XmlRpcClientProxy.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcDeserializer.cs (renamed from XmlRpcCS/XmlRpcDeserializer.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcErrorCodes.cs (renamed from XmlRpcCS/XmlRpcErrorCodes.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcException.cs (renamed from XmlRpcCS/XmlRpcException.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcExposedAttribute.cs (renamed from XmlRpcCS/XmlRpcExposedAttribute.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcRequest.cs (renamed from XmlRpcCS/XmlRpcRequest.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcRequestDeserializer.cs (renamed from XmlRpcCS/XmlRpcRequestDeserializer.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcRequestSerializer.cs (renamed from XmlRpcCS/XmlRpcRequestSerializer.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcResponder.cs (renamed from XmlRpcCS/XmlRpcResponder.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcResponse.cs (renamed from XmlRpcCS/XmlRpcResponse.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcResponseDeserializer.cs (renamed from XmlRpcCS/XmlRpcResponseDeserializer.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcResponseSerializer.cs (renamed from XmlRpcCS/XmlRpcResponseSerializer.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcSerializer.cs (renamed from XmlRpcCS/XmlRpcSerializer.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcServer.cs (renamed from XmlRpcCS/XmlRpcServer.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcSystemObject.cs (renamed from XmlRpcCS/XmlRpcSystemObject.cs)0
-rw-r--r--Common-Source/XmlRpcCS/XmlRpcXmlTokens.cs (renamed from XmlRpcCS/XmlRpcXmlTokens.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs (renamed from OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs (renamed from OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj (renamed from OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build (renamed from OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs (renamed from OpenGrid.Framework.Data.DB4o/DB4oGridData.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oManager.cs (renamed from OpenGrid.Framework.Data.DB4o/DB4oManager.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs (renamed from OpenGrid.Framework.Data.DB4o/DB4oUserData.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj (renamed from OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build (renamed from OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs (renamed from OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs (renamed from OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs (renamed from OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj (renamed from OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build (renamed from OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs (renamed from OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs (renamed from OpenGrid.Framework.Data.MySQL/MySQLGridData.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLManager.cs (renamed from OpenGrid.Framework.Data.MySQL/MySQLManager.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs (renamed from OpenGrid.Framework.Data.MySQL/MySQLUserData.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj (renamed from OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build (renamed from OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs (renamed from OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj (renamed from OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build (renamed from OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs (renamed from OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs (renamed from OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs (renamed from OpenGrid.Framework.Data.SQLite/SQLiteManager.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data/GridData.cs (renamed from OpenGrid.Framework.Data/GridData.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj (renamed from OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build (renamed from OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs (renamed from OpenGrid.Framework.Data/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data/SimProfileData.cs (renamed from OpenGrid.Framework.Data/SimProfileData.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data/UserData.cs (renamed from OpenGrid.Framework.Data/UserData.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Data/UserProfileData.cs (renamed from OpenGrid.Framework.Data/UserProfileData.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Manager/GridManagementAgent.cs (renamed from OpenGrid.Framework.Manager/GridManagementAgent.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Manager/GridServerManager.cs (renamed from OpenGrid.Framework.Manager/GridServerManager.cs)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj (renamed from OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build (renamed from OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.AssetServer/AssetHttpServer.cs (renamed from OpenGridServices.AssetServer/AssetHttpServer.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.AssetServer/Main.cs (renamed from OpenGridServices.AssetServer/Main.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj (renamed from OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build (renamed from OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj (renamed from OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build (renamed from OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs (renamed from OpenGridServices.AssetServer/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.GridServer/GridManager.cs (renamed from OpenGridServices.GridServer/GridManager.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.GridServer/Main.cs (renamed from OpenGridServices.GridServer/Main.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj (renamed from OpenGridServices.GridServer/OpenGridServices.GridServer.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build (renamed from OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.GridServer/Properties/AssemblyInfo.cs (renamed from OpenGridServices.GridServer/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.mds (renamed from OpenGridServices.Manager/OpenGridServices.Manager.mds)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.userprefs (renamed from OpenGridServices.Manager/OpenGridServices.Manager.userprefs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.usertasks (renamed from OpenGridServices.Manager/OpenGridServices.Manager.usertasks)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/Main.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp (renamed from OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb (renamed from OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb)bin12308 -> 12308 bytes
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/Util.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs (renamed from OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic (renamed from OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.UserServer/Main.cs (renamed from OpenGridServices.UserServer/Main.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.UserServer/OGS-UserServer.csproj (renamed from OpenGridServices.UserServer/OGS-UserServer.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj (renamed from OpenGridServices.UserServer/OpenGridServices.UserServer.csproj)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build (renamed from OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.UserServer/Properties/AssemblyInfo.cs (renamed from OpenGridServices.UserServer/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenGridServices.UserServer/UserManager.cs (renamed from OpenGridServices.UserServer/UserManager.cs)0
-rw-r--r--OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs (renamed from OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs)0
-rw-r--r--OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs (renamed from OpenUser.Config/UserConfigDb4o/DbUserConfig.cs)0
-rw-r--r--OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj (renamed from OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj)0
-rw-r--r--OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user12
-rw-r--r--OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build (renamed from OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build)0
-rw-r--r--OpenGridServices-Source/SQL/mysql-agents.sql (renamed from SQL/mysql-agents.sql)0
-rw-r--r--OpenGridServices-Source/SQL/mysql-regions.sql (renamed from SQL/mysql-regions.sql)0
-rw-r--r--OpenGridServices-Source/SQL/mysql-users.sql (renamed from SQL/mysql-users.sql)0
-rw-r--r--OpenGridServices-Source/ServiceManager/ServiceManager.cs160
-rw-r--r--OpenGridServices-Source/ServiceManager/ServiceManager.csproj95
-rw-r--r--OpenGridServices-Source/ServiceManager/ServiceManager.csproj.user12
-rw-r--r--OpenGridServices-Source/ServiceManager/ServiceManager.exe.build41
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Local/AssemblyInfo.cs (renamed from OpenSim.GridInterfaces/Local/AssemblyInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Local/LocalAssetServer.cs (renamed from OpenSim.GridInterfaces/Local/LocalAssetServer.cs)0
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Local/LocalGridServer.cs (renamed from OpenSim.GridInterfaces/Local/LocalGridServer.cs)0
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj (renamed from OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build (renamed from OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs (renamed from OpenSim.GridInterfaces/Remote/AssemblyInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj (renamed from OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build (renamed from OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs (renamed from OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs)0
-rw-r--r--OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs (renamed from OpenSim.GridInterfaces/Remote/RemoteGridServer.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs (renamed from OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs (renamed from OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj (renamed from OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build (renamed from OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/Manager/AssemblyInfo.cs (renamed from OpenSim.Physics/Manager/AssemblyInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj (renamed from OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build (renamed from OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/Manager/PhysicsActor.cs (renamed from OpenSim.Physics/Manager/PhysicsActor.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/Manager/PhysicsManager.cs (renamed from OpenSim.Physics/Manager/PhysicsManager.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/Manager/PhysicsScene.cs (renamed from OpenSim.Physics/Manager/PhysicsScene.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/Manager/PhysicsVector.cs (renamed from OpenSim.Physics/Manager/PhysicsVector.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/OdePlugin/AssemblyInfo.cs (renamed from OpenSim.Physics/OdePlugin/AssemblyInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/OdePlugin/OdePlugin.cs (renamed from OpenSim.Physics/OdePlugin/OdePlugin.cs)908
-rw-r--r--OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj (renamed from OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build (renamed from OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs (renamed from OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj (renamed from OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build (renamed from OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs (renamed from OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs (renamed from OpenSim.RegionServer/AgentAssetUpload.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs (renamed from OpenSim.RegionServer/Assets/AssetCache.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs (renamed from OpenSim.RegionServer/Assets/InventoryCache.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs (renamed from OpenSim.RegionServer/AuthenticateSessionsBase.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs (renamed from OpenSim.RegionServer/AuthenticateSessionsLocal.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs (renamed from OpenSim.RegionServer/AuthenticateSessionsRemote.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs (renamed from OpenSim.RegionServer/CAPS/AdminWebFront.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs (renamed from OpenSim.RegionServer/ClientView.Grid.cs)71
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs (renamed from OpenSim.RegionServer/ClientView.PacketHandlers.cs)27
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs (renamed from OpenSim.RegionServer/ClientView.ProcessPackets.cs)218
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/ClientView.cs (renamed from OpenSim.RegionServer/ClientView.cs)3
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs (renamed from OpenSim.RegionServer/ClientViewBase.cs)4
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/Grid.cs (renamed from OpenSim.RegionServer/Grid.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj (renamed from OpenSim.RegionServer/OpenSim.RegionServer.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build (renamed from OpenSim.RegionServer/OpenSim.RegionServer.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs (renamed from OpenSim.RegionServer/OpenSimMain.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs (renamed from OpenSim.RegionServer/OpenSimNetworkHandler.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/PacketServer.cs (renamed from OpenSim.RegionServer/PacketServer.cs)2
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs (renamed from OpenSim.RegionServer/RegionInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs (renamed from OpenSim.RegionServer/RegionInfoBase.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs (renamed from OpenSim.RegionServer/RegionServerBase.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/UDPServer.cs (renamed from OpenSim.RegionServer/UDPServer.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs (renamed from OpenSim.RegionServer/VersionInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs (renamed from OpenSim.RegionServer/types/Mesh.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs (renamed from OpenSim.RegionServer/types/Triangle.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs (renamed from OpenSim.RegionServer/world/Avatar.Client.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs (renamed from OpenSim.RegionServer/world/Avatar.Update.cs)4
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs (renamed from OpenSim.RegionServer/world/Avatar.cs)7
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs (renamed from OpenSim.RegionServer/world/AvatarAnimations.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/Entity.cs (renamed from OpenSim.RegionServer/world/Entity.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs (renamed from OpenSim.RegionServer/world/Primitive.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs (renamed from OpenSim.RegionServer/world/Primitive2.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs (renamed from OpenSim.RegionServer/world/SceneObject.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs (renamed from OpenSim.RegionServer/world/World.PacketHandlers.cs)149
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs (renamed from OpenSim.RegionServer/world/World.Scripting.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/World.cs (renamed from OpenSim.RegionServer/world/World.cs)20
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs (renamed from OpenSim.RegionServer/world/WorldBase.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs (renamed from OpenSim.RegionServer/world/scripting/IScriptContext.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs (renamed from OpenSim.RegionServer/world/scripting/IScriptEntity.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs (renamed from OpenSim.RegionServer/world/scripting/IScriptHandler.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs (renamed from OpenSim.RegionServer/world/scripting/Script.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs (renamed from OpenSim.RegionServer/world/scripting/ScriptFactory.cs)0
-rw-r--r--OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs (renamed from OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs (renamed from OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs (renamed from OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Heap.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Heap.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Interpreter.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs (renamed from OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs (renamed from OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs (renamed from OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs (renamed from OpenSim.Scripting/EmbeddedJVM/MainMemory.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs (renamed from OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Object.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Object.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj (renamed from OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build (renamed from OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs (renamed from OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Stack.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Stack.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs (renamed from OpenSim.Scripting/EmbeddedJVM/StackFrame.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Thread.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Thread.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs (renamed from OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs (renamed from OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj (renamed from OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build (renamed from OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs (renamed from OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs (renamed from OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs (renamed from OpenSim.Storage/LocalStorageDb4o/MapStorage.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj (renamed from OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build (renamed from OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs (renamed from OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj (renamed from OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build (renamed from OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs (renamed from OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs (renamed from OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj (renamed from OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj)4
-rw-r--r--OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user12
-rw-r--r--OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build (renamed from OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build)3
-rw-r--r--OpenSim-Source/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs (renamed from OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenSim-Source/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs (renamed from OpenSim.Terrain.BasicTerrain/TerrainEngine.cs)0
-rw-r--r--OpenSim-Source/OpenSim/Application.cs (renamed from OpenSim/Application.cs)0
-rw-r--r--OpenSim-Source/OpenSim/OpenSim.csproj (renamed from OpenSim/OpenSim.csproj)0
-rw-r--r--OpenSim-Source/OpenSim/OpenSim.csproj.user13
-rw-r--r--OpenSim-Source/OpenSim/OpenSim.exe.build (renamed from OpenSim/OpenSim.exe.build)0
-rw-r--r--OpenSim-Source/OpenSim/OpenSimMain.cs (renamed from OpenSim/OpenSimMain.cs)0
-rw-r--r--ServiceManager/ServiceManager.csproj33
-rw-r--r--bin/Shortcut to OpenSim.exe.lnkbin0 -> 959 bytes
-rw-r--r--prebuild.xml500
310 files changed, 1739 insertions, 939 deletions
diff --git a/OpenSim.Framework.Console/AssemblyInfo.cs b/Common-Source/OpenSim.Framework.Console/AssemblyInfo.cs
index 00a9b7d..00a9b7d 100644
--- a/OpenSim.Framework.Console/AssemblyInfo.cs
+++ b/Common-Source/OpenSim.Framework.Console/AssemblyInfo.cs
diff --git a/OpenSim.Framework.Console/ConsoleBase.cs b/Common-Source/OpenSim.Framework.Console/ConsoleBase.cs
index 6a1c53c..6a1c53c 100644
--- a/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common-Source/OpenSim.Framework.Console/ConsoleBase.cs
diff --git a/OpenSim.Framework.Console/ConsoleCallbacksBase.cs b/Common-Source/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
index bb589d2..bb589d2 100644
--- a/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
+++ b/Common-Source/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
diff --git a/OpenSim.Framework.Console/MainConsole.cs b/Common-Source/OpenSim.Framework.Console/MainConsole.cs
index 02c4ae8..02c4ae8 100644
--- a/OpenSim.Framework.Console/MainConsole.cs
+++ b/Common-Source/OpenSim.Framework.Console/MainConsole.cs
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
index 0961492..0961492 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
diff --git a/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
index fa90bb6..fa90bb6 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
diff --git a/OpenSim.Framework/AgentInventory.cs b/Common-Source/OpenSim.Framework/AgentInventory.cs
index b28645e..b28645e 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/Common-Source/OpenSim.Framework/AgentInventory.cs
diff --git a/OpenSim.Framework/BlockingQueue.cs b/Common-Source/OpenSim.Framework/BlockingQueue.cs
index f840354..f840354 100644
--- a/OpenSim.Framework/BlockingQueue.cs
+++ b/Common-Source/OpenSim.Framework/BlockingQueue.cs
diff --git a/OpenSim.Framework/HeightMapGenHills.cs b/Common-Source/OpenSim.Framework/HeightMapGenHills.cs
index 6a729da..6a729da 100644
--- a/OpenSim.Framework/HeightMapGenHills.cs
+++ b/Common-Source/OpenSim.Framework/HeightMapGenHills.cs
diff --git a/OpenSim.Framework/Interfaces/IAssetServer.cs b/Common-Source/OpenSim.Framework/Interfaces/IAssetServer.cs
index 3f86acc..3f86acc 100644
--- a/OpenSim.Framework/Interfaces/IAssetServer.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IAssetServer.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs
new file mode 100644
index 0000000..a991fb6
--- /dev/null
+++ b/Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -0,0 +1,30 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Inventory;
5using libsecondlife;
6using libsecondlife.Packets;
7using OpenSim.Framework.Types;
8
9namespace OpenSim.Framework.Interfaces
10{
11 public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
12 public delegate void RezObject(AssetBase primAsset, LLVector3 pos);
13 public delegate void ModifyTerrain(byte action, float north, float west);
14 public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
15 public delegate void StartAnim(LLUUID animID, int seq);
16 public delegate void LinkObjects(uint parent, List<uint> children);
17
18 public interface IClientAPI
19 {
20 event ChatFromViewer OnChatFromViewer;
21 event RezObject OnRezObject;
22 event ModifyTerrain OnModifyTerrain;
23 event SetAppearance OnSetAppearance;
24 event StartAnim OnStartAnim;
25 event LinkObjects OnLinkObjects;
26
27 void SendAppearance(AvatarWearable[] wearables);
28 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
29 }
30}
diff --git a/OpenSim.Framework/Interfaces/IConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IConfig.cs
index 7b4c040..7b4c040 100644
--- a/OpenSim.Framework/Interfaces/IConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IGenericConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IGenericConfig.cs
index a853fe4..a853fe4 100644
--- a/OpenSim.Framework/Interfaces/IGenericConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IGenericConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IGridConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IGridConfig.cs
index b2f26da..b2f26da 100644
--- a/OpenSim.Framework/Interfaces/IGridConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IGridConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IGridServer.cs b/Common-Source/OpenSim.Framework/Interfaces/IGridServer.cs
index e67ea98..e67ea98 100644
--- a/OpenSim.Framework/Interfaces/IGridServer.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IGridServer.cs
diff --git a/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common-Source/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 4dd8868..4dd8868 100644
--- a/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/ILocalStorage.cs
diff --git a/OpenSim.Framework/Interfaces/IScriptAPI.cs b/Common-Source/OpenSim.Framework/Interfaces/IScriptAPI.cs
index 3ad0f06..3ad0f06 100644
--- a/OpenSim.Framework/Interfaces/IScriptAPI.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IScriptAPI.cs
diff --git a/OpenSim.Framework/Interfaces/IScriptEngine.cs b/Common-Source/OpenSim.Framework/Interfaces/IScriptEngine.cs
index ed8974c..ed8974c 100644
--- a/OpenSim.Framework/Interfaces/IScriptEngine.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IScriptEngine.cs
diff --git a/OpenSim.Framework/Interfaces/IUserConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IUserConfig.cs
index e15867d..e15867d 100644
--- a/OpenSim.Framework/Interfaces/IUserConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IUserConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IUserServer.cs b/Common-Source/OpenSim.Framework/Interfaces/IUserServer.cs
index 21f2721..21f2721 100644
--- a/OpenSim.Framework/Interfaces/IUserServer.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IUserServer.cs
diff --git a/OpenSim.Framework/Interfaces/LocalGridBase.cs b/Common-Source/OpenSim.Framework/Interfaces/LocalGridBase.cs
index ff46502..ff46502 100644
--- a/OpenSim.Framework/Interfaces/LocalGridBase.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/LocalGridBase.cs
diff --git a/OpenSim.Framework/Interfaces/RemoteGridBase.cs b/Common-Source/OpenSim.Framework/Interfaces/RemoteGridBase.cs
index ed13ed5..ed13ed5 100644
--- a/OpenSim.Framework/Interfaces/RemoteGridBase.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/RemoteGridBase.cs
diff --git a/OpenSim.Framework/LoginService.cs b/Common-Source/OpenSim.Framework/LoginService.cs
index eba0281..eba0281 100644
--- a/OpenSim.Framework/LoginService.cs
+++ b/Common-Source/OpenSim.Framework/LoginService.cs
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj
index c2f01d8..1b7f3c0 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Framework</AssemblyName> 13 <AssemblyName>OpenSim.Framework</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim.Framework</RootNamespace> 21 <RootNamespace>OpenSim.Framework</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,22 +61,24 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="System" > 68 <Reference Include="System">
62 <HintPath>System.dll</HintPath> 69 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System.Xml" > 72 <Reference Include="System.Data" />
73 <Reference Include="System.Xml">
66 <HintPath>System.Xml.dll</HintPath> 74 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private> 75 <Private>False</Private>
68 </Reference> 76 </Reference>
69 <Reference Include="libsecondlife.dll" > 77 <Reference Include="libsecondlife.dll">
70 <HintPath>..\bin\libsecondlife.dll</HintPath> 78 <HintPath>..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private> 79 <Private>False</Private>
72 </Reference> 80 </Reference>
73 <Reference Include="Db4objects.Db4o.dll" > 81 <Reference Include="Db4objects.Db4o.dll">
74 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> 82 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
75 <Private>False</Private> 83 <Private>False</Private>
76 </Reference> 84 </Reference>
@@ -80,7 +88,7 @@
80 <Name>XMLRPC</Name> 88 <Name>XMLRPC</Name>
81 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 89 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private> 91 <Private>False</Private>
84 </ProjectReference> 92 </ProjectReference>
85 </ItemGroup> 93 </ItemGroup>
86 <ItemGroup> 94 <ItemGroup>
@@ -93,6 +101,7 @@
93 <Compile Include="HeightMapGenHills.cs"> 101 <Compile Include="HeightMapGenHills.cs">
94 <SubType>Code</SubType> 102 <SubType>Code</SubType>
95 </Compile> 103 </Compile>
104 <Compile Include="Interfaces\IClientAPI.cs" />
96 <Compile Include="LoginService.cs"> 105 <Compile Include="LoginService.cs">
97 <SubType>Code</SubType> 106 <SubType>Code</SubType>
98 </Compile> 107 </Compile>
@@ -188,4 +197,4 @@
188 <PostBuildEvent> 197 <PostBuildEvent>
189 </PostBuildEvent> 198 </PostBuildEvent>
190 </PropertyGroup> 199 </PropertyGroup>
191</Project> 200</Project> \ No newline at end of file
diff --git a/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/Common-Source/OpenSim.Framework/OpenSim.Framework.dll.build
index 77d5ce9..fecd382 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common-Source/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -23,6 +23,7 @@
23 <include name="UserProfileManagerBase.cs" /> 23 <include name="UserProfileManagerBase.cs" />
24 <include name="Util.cs" /> 24 <include name="Util.cs" />
25 <include name="Interfaces/IAssetServer.cs" /> 25 <include name="Interfaces/IAssetServer.cs" />
26 <include name="Interfaces/IClientAPI.cs" />
26 <include name="Interfaces/IConfig.cs" /> 27 <include name="Interfaces/IConfig.cs" />
27 <include name="Interfaces/IGenericConfig.cs" /> 28 <include name="Interfaces/IGenericConfig.cs" />
28 <include name="Interfaces/IGridConfig.cs" /> 29 <include name="Interfaces/IGridConfig.cs" />
diff --git a/OpenSim.Framework/Properties/AssemblyInfo.cs b/Common-Source/OpenSim.Framework/Properties/AssemblyInfo.cs
index 86f5cdb..86f5cdb 100644
--- a/OpenSim.Framework/Properties/AssemblyInfo.cs
+++ b/Common-Source/OpenSim.Framework/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Framework/Remoting.cs b/Common-Source/OpenSim.Framework/Remoting.cs
index 1212ee5..1212ee5 100644
--- a/OpenSim.Framework/Remoting.cs
+++ b/Common-Source/OpenSim.Framework/Remoting.cs
diff --git a/OpenSim.Framework/SimProfile.cs b/Common-Source/OpenSim.Framework/SimProfile.cs
index 8acb20b..8acb20b 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/Common-Source/OpenSim.Framework/SimProfile.cs
diff --git a/OpenSim.Framework/SimProfileBase.cs b/Common-Source/OpenSim.Framework/SimProfileBase.cs
index 30e2e0f..30e2e0f 100644
--- a/OpenSim.Framework/SimProfileBase.cs
+++ b/Common-Source/OpenSim.Framework/SimProfileBase.cs
diff --git a/OpenSim.Framework/Types/AgentCiruitData.cs b/Common-Source/OpenSim.Framework/Types/AgentCiruitData.cs
index 7314586..7314586 100644
--- a/OpenSim.Framework/Types/AgentCiruitData.cs
+++ b/Common-Source/OpenSim.Framework/Types/AgentCiruitData.cs
diff --git a/OpenSim.Framework/Types/AssetBase.cs b/Common-Source/OpenSim.Framework/Types/AssetBase.cs
index f6104f8..f6104f8 100644
--- a/OpenSim.Framework/Types/AssetBase.cs
+++ b/Common-Source/OpenSim.Framework/Types/AssetBase.cs
diff --git a/OpenSim.Framework/Types/AssetLandmark.cs b/Common-Source/OpenSim.Framework/Types/AssetLandmark.cs
index 9d1a326..9d1a326 100644
--- a/OpenSim.Framework/Types/AssetLandmark.cs
+++ b/Common-Source/OpenSim.Framework/Types/AssetLandmark.cs
diff --git a/OpenSim.Framework/Types/AssetStorage.cs b/Common-Source/OpenSim.Framework/Types/AssetStorage.cs
index 5b5b3b2..5b5b3b2 100644
--- a/OpenSim.Framework/Types/AssetStorage.cs
+++ b/Common-Source/OpenSim.Framework/Types/AssetStorage.cs
diff --git a/OpenSim.Framework/Types/Login.cs b/Common-Source/OpenSim.Framework/Types/Login.cs
index 71f9de3..71f9de3 100644
--- a/OpenSim.Framework/Types/Login.cs
+++ b/Common-Source/OpenSim.Framework/Types/Login.cs
diff --git a/OpenSim.Framework/Types/NeighbourInfo.cs b/Common-Source/OpenSim.Framework/Types/NeighbourInfo.cs
index 58b6cb1..58b6cb1 100644
--- a/OpenSim.Framework/Types/NeighbourInfo.cs
+++ b/Common-Source/OpenSim.Framework/Types/NeighbourInfo.cs
diff --git a/OpenSim.Framework/Types/OSVector3.cs b/Common-Source/OpenSim.Framework/Types/OSVector3.cs
index 8fb840b..8fb840b 100644
--- a/OpenSim.Framework/Types/OSVector3.cs
+++ b/Common-Source/OpenSim.Framework/Types/OSVector3.cs
diff --git a/OpenSim.Framework/Types/PrimData.cs b/Common-Source/OpenSim.Framework/Types/PrimData.cs
index 68e2a22..68e2a22 100644
--- a/OpenSim.Framework/Types/PrimData.cs
+++ b/Common-Source/OpenSim.Framework/Types/PrimData.cs
diff --git a/OpenSim.Framework/UserProfile.cs b/Common-Source/OpenSim.Framework/UserProfile.cs
index f95a8fa..f95a8fa 100644
--- a/OpenSim.Framework/UserProfile.cs
+++ b/Common-Source/OpenSim.Framework/UserProfile.cs
diff --git a/OpenSim.Framework/UserProfileManager.cs b/Common-Source/OpenSim.Framework/UserProfileManager.cs
index 18b3513..18b3513 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/Common-Source/OpenSim.Framework/UserProfileManager.cs
diff --git a/OpenSim.Framework/UserProfileManagerBase.cs b/Common-Source/OpenSim.Framework/UserProfileManagerBase.cs
index d1307a5..d1307a5 100644
--- a/OpenSim.Framework/UserProfileManagerBase.cs
+++ b/Common-Source/OpenSim.Framework/UserProfileManagerBase.cs
diff --git a/OpenSim.Framework/Util.cs b/Common-Source/OpenSim.Framework/Util.cs
index 400f415..400f415 100644
--- a/OpenSim.Framework/Util.cs
+++ b/Common-Source/OpenSim.Framework/Util.cs
diff --git a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
index 98e813e..98e813e 100644
--- a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
+++ b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
diff --git a/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
index f34e4ac..f34e4ac 100644
--- a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
diff --git a/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs b/Common-Source/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
index de5f48d..de5f48d 100644
--- a/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
+++ b/Common-Source/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
diff --git a/OpenSim.GenericConfig/Xml/XmlConfig.cs b/Common-Source/OpenSim.GenericConfig/Xml/XmlConfig.cs
index 62e3cbf..62e3cbf 100644
--- a/OpenSim.GenericConfig/Xml/XmlConfig.cs
+++ b/Common-Source/OpenSim.GenericConfig/Xml/XmlConfig.cs
diff --git a/OpenSim.Servers/BaseHttpServer.cs b/Common-Source/OpenSim.Servers/BaseHttpServer.cs
index 38f4370..38f4370 100644
--- a/OpenSim.Servers/BaseHttpServer.cs
+++ b/Common-Source/OpenSim.Servers/BaseHttpServer.cs
diff --git a/OpenSim.Servers/BaseServer.cs b/Common-Source/OpenSim.Servers/BaseServer.cs
index 0a4c498..0a4c498 100644
--- a/OpenSim.Servers/BaseServer.cs
+++ b/Common-Source/OpenSim.Servers/BaseServer.cs
diff --git a/OpenSim.Servers/CheckSumServer.cs b/Common-Source/OpenSim.Servers/CheckSumServer.cs
index ae1724f..ae1724f 100644
--- a/OpenSim.Servers/CheckSumServer.cs
+++ b/Common-Source/OpenSim.Servers/CheckSumServer.cs
diff --git a/OpenSim.Servers/IRestHandler.cs b/Common-Source/OpenSim.Servers/IRestHandler.cs
index c322505..c322505 100644
--- a/OpenSim.Servers/IRestHandler.cs
+++ b/Common-Source/OpenSim.Servers/IRestHandler.cs
diff --git a/OpenSim.Servers/LocalUserProfileManager.cs b/Common-Source/OpenSim.Servers/LocalUserProfileManager.cs
index a8b5f1f..a8b5f1f 100644
--- a/OpenSim.Servers/LocalUserProfileManager.cs
+++ b/Common-Source/OpenSim.Servers/LocalUserProfileManager.cs
diff --git a/OpenSim.Servers/LoginResponse.cs b/Common-Source/OpenSim.Servers/LoginResponse.cs
index 7333d1f..7333d1f 100644
--- a/OpenSim.Servers/LoginResponse.cs
+++ b/Common-Source/OpenSim.Servers/LoginResponse.cs
diff --git a/OpenSim.Servers/LoginServer.cs b/Common-Source/OpenSim.Servers/LoginServer.cs
index 6fd174b..6fd174b 100644
--- a/OpenSim.Servers/LoginServer.cs
+++ b/Common-Source/OpenSim.Servers/LoginServer.cs
diff --git a/OpenSim.Servers/OpenSim.Servers.csproj b/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj
index 72f637b..72f637b 100644
--- a/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj
diff --git a/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Servers/OpenSim.Servers.dll.build b/Common-Source/OpenSim.Servers/OpenSim.Servers.dll.build
index 5afd9e1..5afd9e1 100644
--- a/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common-Source/OpenSim.Servers/OpenSim.Servers.dll.build
diff --git a/OpenSim.Servers/UDPServerBase.cs b/Common-Source/OpenSim.Servers/UDPServerBase.cs
index a308052..a308052 100644
--- a/OpenSim.Servers/UDPServerBase.cs
+++ b/Common-Source/OpenSim.Servers/UDPServerBase.cs
diff --git a/OpenSim.Servers/XmlRpcMethod.cs b/Common-Source/OpenSim.Servers/XmlRpcMethod.cs
index 2295405..2295405 100644
--- a/OpenSim.Servers/XmlRpcMethod.cs
+++ b/Common-Source/OpenSim.Servers/XmlRpcMethod.cs
diff --git a/XmlRpcCS/Logger.cs b/Common-Source/XmlRpcCS/Logger.cs
index ebf804b..ebf804b 100644
--- a/XmlRpcCS/Logger.cs
+++ b/Common-Source/XmlRpcCS/Logger.cs
diff --git a/XmlRpcCS/SimpleHttpRequest.cs b/Common-Source/XmlRpcCS/SimpleHttpRequest.cs
index e5326c3..e5326c3 100644
--- a/XmlRpcCS/SimpleHttpRequest.cs
+++ b/Common-Source/XmlRpcCS/SimpleHttpRequest.cs
diff --git a/XmlRpcCS/XMLRPC.csproj b/Common-Source/XmlRpcCS/XMLRPC.csproj
index 2c7ef94..2c7ef94 100644
--- a/XmlRpcCS/XMLRPC.csproj
+++ b/Common-Source/XmlRpcCS/XMLRPC.csproj
diff --git a/Common-Source/XmlRpcCS/XMLRPC.csproj.user b/Common-Source/XmlRpcCS/XMLRPC.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/XmlRpcCS/XMLRPC.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/XmlRpcCS/XMLRPC.dll.build b/Common-Source/XmlRpcCS/XMLRPC.dll.build
index d734d19..d734d19 100644
--- a/XmlRpcCS/XMLRPC.dll.build
+++ b/Common-Source/XmlRpcCS/XMLRPC.dll.build
diff --git a/XmlRpcCS/XmlRpcBoxcarRequest.cs b/Common-Source/XmlRpcCS/XmlRpcBoxcarRequest.cs
index f87f7a5..f87f7a5 100644
--- a/XmlRpcCS/XmlRpcBoxcarRequest.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcBoxcarRequest.cs
diff --git a/XmlRpcCS/XmlRpcClientProxy.cs b/Common-Source/XmlRpcCS/XmlRpcClientProxy.cs
index f52273a..f52273a 100644
--- a/XmlRpcCS/XmlRpcClientProxy.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcClientProxy.cs
diff --git a/XmlRpcCS/XmlRpcDeserializer.cs b/Common-Source/XmlRpcCS/XmlRpcDeserializer.cs
index bd736c0..bd736c0 100644
--- a/XmlRpcCS/XmlRpcDeserializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcDeserializer.cs
diff --git a/XmlRpcCS/XmlRpcErrorCodes.cs b/Common-Source/XmlRpcCS/XmlRpcErrorCodes.cs
index 6dec57d..6dec57d 100644
--- a/XmlRpcCS/XmlRpcErrorCodes.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcErrorCodes.cs
diff --git a/XmlRpcCS/XmlRpcException.cs b/Common-Source/XmlRpcCS/XmlRpcException.cs
index fd1f4ae..fd1f4ae 100644
--- a/XmlRpcCS/XmlRpcException.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcException.cs
diff --git a/XmlRpcCS/XmlRpcExposedAttribute.cs b/Common-Source/XmlRpcCS/XmlRpcExposedAttribute.cs
index 67b27ae..67b27ae 100644
--- a/XmlRpcCS/XmlRpcExposedAttribute.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcExposedAttribute.cs
diff --git a/XmlRpcCS/XmlRpcRequest.cs b/Common-Source/XmlRpcCS/XmlRpcRequest.cs
index 18d2182..18d2182 100644
--- a/XmlRpcCS/XmlRpcRequest.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcRequest.cs
diff --git a/XmlRpcCS/XmlRpcRequestDeserializer.cs b/Common-Source/XmlRpcCS/XmlRpcRequestDeserializer.cs
index 0770b7e..0770b7e 100644
--- a/XmlRpcCS/XmlRpcRequestDeserializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcRequestDeserializer.cs
diff --git a/XmlRpcCS/XmlRpcRequestSerializer.cs b/Common-Source/XmlRpcCS/XmlRpcRequestSerializer.cs
index 8099bdb..8099bdb 100644
--- a/XmlRpcCS/XmlRpcRequestSerializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcRequestSerializer.cs
diff --git a/XmlRpcCS/XmlRpcResponder.cs b/Common-Source/XmlRpcCS/XmlRpcResponder.cs
index 0412568..0412568 100644
--- a/XmlRpcCS/XmlRpcResponder.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcResponder.cs
diff --git a/XmlRpcCS/XmlRpcResponse.cs b/Common-Source/XmlRpcCS/XmlRpcResponse.cs
index 8ff8354..8ff8354 100644
--- a/XmlRpcCS/XmlRpcResponse.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcResponse.cs
diff --git a/XmlRpcCS/XmlRpcResponseDeserializer.cs b/Common-Source/XmlRpcCS/XmlRpcResponseDeserializer.cs
index 032d8a3..032d8a3 100644
--- a/XmlRpcCS/XmlRpcResponseDeserializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcResponseDeserializer.cs
diff --git a/XmlRpcCS/XmlRpcResponseSerializer.cs b/Common-Source/XmlRpcCS/XmlRpcResponseSerializer.cs
index 72ca568..72ca568 100644
--- a/XmlRpcCS/XmlRpcResponseSerializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcResponseSerializer.cs
diff --git a/XmlRpcCS/XmlRpcSerializer.cs b/Common-Source/XmlRpcCS/XmlRpcSerializer.cs
index 0643d38..0643d38 100644
--- a/XmlRpcCS/XmlRpcSerializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcSerializer.cs
diff --git a/XmlRpcCS/XmlRpcServer.cs b/Common-Source/XmlRpcCS/XmlRpcServer.cs
index 1c226c1..1c226c1 100644
--- a/XmlRpcCS/XmlRpcServer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcServer.cs
diff --git a/XmlRpcCS/XmlRpcSystemObject.cs b/Common-Source/XmlRpcCS/XmlRpcSystemObject.cs
index 5f79951..5f79951 100644
--- a/XmlRpcCS/XmlRpcSystemObject.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcSystemObject.cs
diff --git a/XmlRpcCS/XmlRpcXmlTokens.cs b/Common-Source/XmlRpcCS/XmlRpcXmlTokens.cs
index 50788bd..50788bd 100644
--- a/XmlRpcCS/XmlRpcXmlTokens.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcXmlTokens.cs
diff --git a/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
index b5065bc..b5065bc 100644
--- a/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
diff --git a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
index 2d00ca6..2d00ca6 100644
--- a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
diff --git a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
index 00d987b..00d987b 100644
--- a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
index 61d3efd..61d3efd 100644
--- a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
index 546713e..546713e 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
index aaa6e91..aaa6e91 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
index 7dd4c51..7dd4c51 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
diff --git a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index 02abc3e..02abc3e 100644
--- a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
index 144813b..144813b 100644
--- a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
diff --git a/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
index dc4a9a1..dc4a9a1 100644
--- a/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
index 0925df1..0925df1 100644
--- a/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
diff --git a/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
index 12c166c..12c166c 100644
--- a/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
diff --git a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
index efb6a32..efb6a32 100644
--- a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
index 61b1826..61b1826 100644
--- a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
diff --git a/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
index bbe3cdf..bbe3cdf 100644
--- a/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
index 46183b4..46183b4 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
index a476e97..a476e97 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
index 0741272..0741272 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
diff --git a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index ae3d5c5..ae3d5c5 100644
--- a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
index a390324..a390324 100644
--- a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
diff --git a/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
index 0bfd1d6..0bfd1d6 100644
--- a/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index ef2ecaa..ef2ecaa 100644
--- a/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
index d9a2369..d9a2369 100644
--- a/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
diff --git a/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
index 57c4bae..57c4bae 100644
--- a/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
index 4850f12..4850f12 100644
--- a/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
diff --git a/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
index 408a582..408a582 100644
--- a/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
diff --git a/OpenGrid.Framework.Data/GridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/GridData.cs
index 6dad37e..6dad37e 100644
--- a/OpenGrid.Framework.Data/GridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/GridData.cs
diff --git a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index 201f7ba..201f7ba 100644
--- a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index a3fd771..a3fd771 100644
--- a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
diff --git a/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
index 1446673..1446673 100644
--- a/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data/SimProfileData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/SimProfileData.cs
index c66610e..c66610e 100644
--- a/OpenGrid.Framework.Data/SimProfileData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/SimProfileData.cs
diff --git a/OpenGrid.Framework.Data/UserData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/UserData.cs
index 1b37957..1b37957 100644
--- a/OpenGrid.Framework.Data/UserData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/UserData.cs
diff --git a/OpenGrid.Framework.Data/UserProfileData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/UserProfileData.cs
index 3f42762..3f42762 100644
--- a/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/UserProfileData.cs
diff --git a/OpenGrid.Framework.Manager/GridManagementAgent.cs b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridManagementAgent.cs
index e43ce87..e43ce87 100644
--- a/OpenGrid.Framework.Manager/GridManagementAgent.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridManagementAgent.cs
diff --git a/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridServerManager.cs
index 7ebf66a..7ebf66a 100644
--- a/OpenGrid.Framework.Manager/GridServerManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridServerManager.cs
diff --git a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
index 3122633..3122633 100644
--- a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
index daee3bf..daee3bf 100644
--- a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
diff --git a/OpenGridServices.AssetServer/AssetHttpServer.cs b/OpenGridServices-Source/OpenGridServices.AssetServer/AssetHttpServer.cs
index 8439e92..8439e92 100644
--- a/OpenGridServices.AssetServer/AssetHttpServer.cs
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/AssetHttpServer.cs
diff --git a/OpenGridServices.AssetServer/Main.cs b/OpenGridServices-Source/OpenGridServices.AssetServer/Main.cs
index 684d683..684d683 100644
--- a/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/Main.cs
diff --git a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
index d01a52e..d01a52e 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
index cd76f22..cd76f22 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
diff --git a/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
index 9b8cc87..9b8cc87 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
diff --git a/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
index 6bef534..6bef534 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
diff --git a/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
index 7014284..7014284 100644
--- a/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices-Source/OpenGridServices.GridServer/GridManager.cs
index 54e4bb7..54e4bb7 100644
--- a/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/GridManager.cs
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices-Source/OpenGridServices.GridServer/Main.cs
index cad5fae..cad5fae 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/Main.cs
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
index 5f3fc6f..5f3fc6f 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 9ca4d4b..9ca4d4b 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
diff --git a/OpenGridServices.GridServer/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
index 8471e6b..8471e6b 100644
--- a/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager.mds b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.mds
index ed7bc24..ed7bc24 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager.mds
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.mds
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager.userprefs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
index f221509..f221509 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager.usertasks b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
index d887d0e..d887d0e 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
index af4e275..af4e275 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
index 83685fc..83685fc 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
index 0d509ef..0d509ef 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
index 8a80b1d..8a80b1d 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
index 6b632d6..6b632d6 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
index 42e09e0..42e09e0 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
index 1db38f0..1db38f0 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
index cfdc085..cfdc085 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
index 44e7a61..44e7a61 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
Binary files differ
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
index 00f7c65..00f7c65 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
index 5bf7ff9..5bf7ff9 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
index da6739e..da6739e 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
index 8798dac..8798dac 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
index dd4abdd..dd4abdd 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
index c883f08..c883f08 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices-Source/OpenGridServices.UserServer/Main.cs
index 0eb314b..0eb314b 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/Main.cs
diff --git a/OpenGridServices.UserServer/OGS-UserServer.csproj b/OpenGridServices-Source/OpenGridServices.UserServer/OGS-UserServer.csproj
index f4fa8b6..f4fa8b6 100644
--- a/OpenGridServices.UserServer/OGS-UserServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OGS-UserServer.csproj
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index 9f4da40..9f4da40 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 548c3cc..548c3cc 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
diff --git a/OpenGridServices.UserServer/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
index 5d5ce8d..5d5ce8d 100644
--- a/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices-Source/OpenGridServices.UserServer/UserManager.cs
index a312445..a312445 100644
--- a/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/UserManager.cs
diff --git a/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
index 56a5535..56a5535 100644
--- a/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
diff --git a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
index a281889..a281889 100644
--- a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
diff --git a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
index 8c4fd39..8c4fd39 100644
--- a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
diff --git a/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
index 8494a0b..8494a0b 100644
--- a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
diff --git a/SQL/mysql-agents.sql b/OpenGridServices-Source/SQL/mysql-agents.sql
index 8194ca9..8194ca9 100644
--- a/SQL/mysql-agents.sql
+++ b/OpenGridServices-Source/SQL/mysql-agents.sql
diff --git a/SQL/mysql-regions.sql b/OpenGridServices-Source/SQL/mysql-regions.sql
index 5392f7f..5392f7f 100644
--- a/SQL/mysql-regions.sql
+++ b/OpenGridServices-Source/SQL/mysql-regions.sql
diff --git a/SQL/mysql-users.sql b/OpenGridServices-Source/SQL/mysql-users.sql
index 5ce4d1c..5ce4d1c 100644
--- a/SQL/mysql-users.sql
+++ b/OpenGridServices-Source/SQL/mysql-users.sql
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.cs b/OpenGridServices-Source/ServiceManager/ServiceManager.cs
new file mode 100644
index 0000000..b21a5b1
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.cs
@@ -0,0 +1,160 @@
1using System;
2using System.Diagnostics;
3using System.Threading;
4using System.ServiceProcess;
5using System.Xml;
6using System.IO;
7
8public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
9
10 private Thread ServiceWorkerThread;
11
12 public OpenGridMasterService()
13 {
14 CanPauseAndContinue = false;
15 ServiceName = "OpenGridServices-master";
16 }
17
18 private void InitializeComponent()
19 {
20 this.CanPauseAndContinue = false;
21 this.CanShutdown = true;
22 this.ServiceName = "OpenGridServices-master";
23 }
24
25 protected override void OnStart(string[] args)
26 {
27 ServiceWorkerThread = new Thread(new ThreadStart(MainServiceThread));
28 ServiceWorkerThread.Start();
29 }
30
31 protected override void OnStop()
32 {
33 ServiceWorkerThread.Abort();
34 }
35
36 private void MainServiceThread()
37 {
38 try {
39 StreamReader reader=new StreamReader("opengrid-master-cfg.xml");
40
41 string configxml = reader.ReadToEnd();
42 XmlDocument doc = new XmlDocument();
43 doc.LoadXml(configxml);
44 XmlNode rootnode = doc.FirstChild;
45 if (rootnode.Name != "regions")
46 {
47 EventLog.WriteEntry("ERROR! bad XML in opengrid-master-cfg.xml - expected regions tag");
48 Console.WriteLine("Sorry, could not startup the service - please check your opengrid-master-cfg.xml file: missing regions tag");
49 (new ServiceController("OpenGridServices-master")).Stop();
50 }
51
52 for(int i=0; i<=rootnode.ChildNodes.Count; i++)
53 {
54 if(rootnode.ChildNodes.Item(i).Name != "region") {
55 EventLog.WriteEntry("nonfatal error - unexpected tag inside regions block of opengrid-master-cfg.xml");
56 (new ServiceController("OpenGridServices-master")).Stop();
57 }
58 }
59 } catch(Exception e) {
60 Console.WriteLine(e.ToString());
61 (new ServiceController("OpenGridServices-master")).Stop();
62 }
63
64 }
65
66 private static string SetupGrid()
67 {
68 Console.WriteLine("Running external program (OpenGridServices.GridServer.exe) to configure the grid server");
69 Process p = new Process();
70
71 p.StartInfo.Arguments = "-setuponly";
72 p.StartInfo.FileName = "OpenGridServices.GridServer.exe";
73 p.Start();
74
75 return "<gridserver />"; // we let the gridserver handle it's own setup
76 }
77
78 private static string SetupUser()
79 {
80 return "<user></user>";
81 }
82
83 private static string SetupAsset()
84 {
85 return "<asset></asset>";
86 }
87
88 private static string SetupRegion()
89 {
90 return "<regions></regions>";
91 }
92
93 public static void InitSetup()
94 {
95 string choice="";
96
97 string GridInfo;
98 string UserInfo;
99 string AssetInfo;
100 string RegionInfo;
101
102 bool grid=false;
103 bool user=false;
104 bool asset=false;
105 bool region=false;
106 while(choice!="OK")
107 {
108 Console.Clear();
109 Console.WriteLine("Please select the components you would like to run on this server:\n");
110
111 Console.WriteLine("1 - [" + (grid ? "X" : " ") + "] Grid server - this service handles co-ordinates of regions/sims on the grid");
112 Console.WriteLine("2 - [" + (user ? "X" : " ") + "] User server - this service handles user login, profiles, inventory and IM");
113 Console.WriteLine("3 - [" + (asset ? "X" : " ") + "] Asset server - this service handles storage of assets such as textures, objects, sounds, scripts");
114 Console.WriteLine("4 - [" + (region ? "X" : " ") + "] Region server - this is the main opensim server and can run without the above services, it handles physics simulation, terrain, building and other such features");
115
116
117 Console.Write("Type a number to toggle a choice or type OK to accept your current choices: ");
118 choice = Console.ReadLine();
119 switch(choice)
120 {
121 case "1":
122 grid = (!grid);
123 break;
124
125 case "2":
126 user = (!user);
127 break;
128
129 case "3":
130 asset = (!asset);
131 break;
132
133 case "4":
134 region = (!region);
135 break;
136 }
137 }
138
139 if(grid) GridInfo = SetupGrid();
140 if(user) UserInfo = SetupUser();
141 if(asset) AssetInfo = SetupAsset();
142 if(region) RegionInfo = SetupRegion();
143 }
144
145 public static void Main()
146 {
147 if(!File.Exists("opengrid-master-cfg.xml"))
148 {
149 Console.WriteLine("Could not find a config file, running initial setup");
150 InitSetup();
151 }
152 Console.WriteLine("Starting up OGS master service");
153 try {
154 ServiceBase.Run(new OpenGridMasterService());
155 } catch(Exception e) {
156 Console.WriteLine("THIS SHOULD NEVER HAPPEN!!!!!!!!!!!!!!!!!!!!!");
157 Console.WriteLine(e.ToString());
158 }
159 }
160}
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.csproj b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj
new file mode 100644
index 0000000..ac118c3
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj
@@ -0,0 +1,95 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName>
13 <AssemblyName>ServiceManager</AssemblyName>
14 <DefaultClientScript>JScript</DefaultClientScript>
15 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign>
18 <OutputType>Exe</OutputType>
19 <AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>ServiceManager</RootNamespace>
22 <StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags>
25 </FileUpgradeFlags>
26 </PropertyGroup>
27 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
28 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
29 <BaseAddress>285212672</BaseAddress>
30 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
31 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize>
39 <OutputPath>..\bin\</OutputPath>
40 <RegisterForComInterop>False</RegisterForComInterop>
41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel>
44 <NoWarn>
45 </NoWarn>
46 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
49 <BaseAddress>285212672</BaseAddress>
50 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
51 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize>
59 <OutputPath>..\bin\</OutputPath>
60 <RegisterForComInterop>False</RegisterForComInterop>
61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel>
64 <NoWarn>
65 </NoWarn>
66 </PropertyGroup>
67 <ItemGroup>
68 <Reference Include="System">
69 <HintPath>System.dll</HintPath>
70 <Private>False</Private>
71 </Reference>
72 <Reference Include="System.ServiceProcess">
73 <HintPath>System.ServiceProcess.dll</HintPath>
74 <Private>False</Private>
75 </Reference>
76 <Reference Include="System.Xml">
77 <HintPath>System.Xml.dll</HintPath>
78 <Private>False</Private>
79 </Reference>
80 </ItemGroup>
81 <ItemGroup>
82 </ItemGroup>
83 <ItemGroup>
84 <Compile Include="ServiceManager.cs">
85 <SubType>Component</SubType>
86 </Compile>
87 </ItemGroup>
88 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
89 <PropertyGroup>
90 <PreBuildEvent>
91 </PreBuildEvent>
92 <PostBuildEvent>
93 </PostBuildEvent>
94 </PropertyGroup>
95</Project> \ No newline at end of file
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.csproj.user b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.exe.build b/OpenGridServices-Source/ServiceManager/ServiceManager.exe.build
new file mode 100644
index 0000000..7397f49
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.exe.build
@@ -0,0 +1,41 @@
1<?xml version="1.0" ?>
2<project name="ServiceManager" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
9 </copy>
10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
11 <resources prefix="ServiceManager" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="ServiceManager.cs" />
15 </sources>
16 <references basedir="${project::get-base-directory()}">
17 <lib>
18 <include name="${project::get-base-directory()}" />
19 <include name="${project::get-base-directory()}/${build.dir}" />
20 </lib>
21 <include name="System.dll" />
22 <include name="System.ServiceProcess.dll" />
23 <include name="System.Xml.dll" />
24 </references>
25 </csc>
26 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
27 <mkdir dir="${project::get-base-directory()}/../bin/"/>
28 <copy todir="${project::get-base-directory()}/../bin/">
29 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
30 <include name="*.dll"/>
31 <include name="*.exe"/>
32 </fileset>
33 </copy>
34 </target>
35 <target name="clean">
36 <delete dir="${bin.dir}" failonerror="false" />
37 <delete dir="${obj.dir}" failonerror="false" />
38 </target>
39 <target name="doc" description="Creates documentation.">
40 </target>
41</project>
diff --git a/OpenSim.GridInterfaces/Local/AssemblyInfo.cs b/OpenSim-Source/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
index 103b49a..103b49a 100644
--- a/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index 5f75821..5f75821 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
diff --git a/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index fdd6ba4..fdd6ba4 100644
--- a/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalGridServer.cs
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
index 1aec5aa..1aec5aa 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index 6bf398e..6bf398e 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
diff --git a/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim-Source/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
index 0fa7d6e..0fa7d6e 100644
--- a/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
index b004c10..b004c10 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index 96272dd..96272dd 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index 7432dee..7432dee 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
diff --git a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
index 7f911d8..7f911d8 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index 0c9c06c..0c9c06c 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index c37acc8..c37acc8 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
index 6d5b4d0..6d5b4d0 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
index 3497a55..3497a55 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
diff --git a/OpenSim.Physics/Manager/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/Manager/AssemblyInfo.cs
index 57a8913..57a8913 100644
--- a/OpenSim.Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/AssemblyInfo.cs
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
index 294e005..294e005 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 4b5ee51..4b5ee51 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
diff --git a/OpenSim.Physics/Manager/PhysicsActor.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsActor.cs
index a0b6c21..a0b6c21 100644
--- a/OpenSim.Physics/Manager/PhysicsActor.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsActor.cs
diff --git a/OpenSim.Physics/Manager/PhysicsManager.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsManager.cs
index 291fc7e..291fc7e 100644
--- a/OpenSim.Physics/Manager/PhysicsManager.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsManager.cs
diff --git a/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsScene.cs
index 7dab4e1..7dab4e1 100644
--- a/OpenSim.Physics/Manager/PhysicsScene.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsScene.cs
diff --git a/OpenSim.Physics/Manager/PhysicsVector.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsVector.cs
index 3c824d0..3c824d0 100644
--- a/OpenSim.Physics/Manager/PhysicsVector.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsVector.cs
diff --git a/OpenSim.Physics/OdePlugin/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
index 913aae7..913aae7 100644
--- a/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
diff --git a/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim-Source/OpenSim.Physics/OdePlugin/OdePlugin.cs
index 137e44d..599dea8 100644
--- a/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OdePlugin.cs
@@ -1,456 +1,452 @@
1/* 1/*
2* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ 2* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
3* 3*
4* Redistribution and use in source and binary forms, with or without 4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met: 5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright 6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer. 7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright 8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the 9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution. 10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the 11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products 12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission. 13* derived from this software without specific prior written permission.
14* 14*
15* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY 15* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY 18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25* 25*
26*/ 26*/
27using System; 27using System;
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenSim.Physics.Manager; 29using OpenSim.Physics.Manager;
30using Ode.NET; 30using Ode.NET;
31 31
32namespace OpenSim.Physics.OdePlugin 32namespace OpenSim.Physics.OdePlugin
33{ 33{
34 /// <summary> 34 /// <summary>
35 /// ODE plugin 35 /// ODE plugin
36 /// </summary> 36 /// </summary>
37 public class OdePlugin : IPhysicsPlugin 37 public class OdePlugin : IPhysicsPlugin
38 { 38 {
39 private OdeScene _mScene; 39 private OdeScene _mScene;
40 40
41 public OdePlugin() 41 public OdePlugin()
42 { 42 {
43 43
44 } 44 }
45 45
46 public bool Init() 46 public bool Init()
47 { 47 {
48 return true; 48 return true;
49 } 49 }
50 50
51 public PhysicsScene GetScene() 51 public PhysicsScene GetScene()
52 { 52 {
53 if (_mScene == null) 53 if (_mScene == null)
54 { 54 {
55 _mScene = new OdeScene(); 55 _mScene = new OdeScene();
56 } 56 }
57 return (_mScene); 57 return (_mScene);
58 } 58 }
59 59
60 public string GetName() 60 public string GetName()
61 { 61 {
62 return ("OpenDynamicsEngine"); 62 return ("OpenDynamicsEngine");
63 } 63 }
64 64
65 public void Dispose() 65 public void Dispose()
66 { 66 {
67 67
68 } 68 }
69 } 69 }
70 70
71 public class OdeScene : PhysicsScene 71 public class OdeScene : PhysicsScene
72 { 72 {
73 static public IntPtr world; 73 static public IntPtr world;
74 static public IntPtr space; 74 static public IntPtr space;
75 static private IntPtr contactgroup; 75 static private IntPtr contactgroup;
76 static private IntPtr LandGeom; 76 static private IntPtr LandGeom;
77 //static private IntPtr Land; 77 //static private IntPtr Land;
78 private double[] _heightmap; 78 private double[] _heightmap;
79 static private d.NearCallback nearCallback = near; 79 static private d.NearCallback nearCallback = near;
80 private List<OdeCharacter> _characters = new List<OdeCharacter>(); 80 private List<OdeCharacter> _characters = new List<OdeCharacter>();
81 private static d.ContactGeom[] contacts = new d.ContactGeom[30]; 81 private static d.ContactGeom[] contacts = new d.ContactGeom[30];
82 private static d.Contact contact; 82 private static d.Contact contact;
83 83
84 public OdeScene() 84 public OdeScene()
85 { 85 {
86 contact.surface.mode = d.ContactFlags.Bounce | d.ContactFlags.SoftCFM; 86 contact.surface.mode = d.ContactFlags.Bounce | d.ContactFlags.SoftCFM;
87 contact.surface.mu = d.Infinity; 87 contact.surface.mu = d.Infinity;
88 contact.surface.mu2 = 0.0f; 88 contact.surface.mu2 = 0.0f;
89 contact.surface.bounce = 0.1f; 89 contact.surface.bounce = 0.1f;
90 contact.surface.bounce_vel = 0.1f; 90 contact.surface.bounce_vel = 0.1f;
91 contact.surface.soft_cfm = 0.01f; 91 contact.surface.soft_cfm = 0.01f;
92 92
93 world = d.WorldCreate(); 93 world = d.WorldCreate();
94 space = d.HashSpaceCreate(IntPtr.Zero); 94 space = d.HashSpaceCreate(IntPtr.Zero);
95 contactgroup = d.JointGroupCreate(0); 95 contactgroup = d.JointGroupCreate(0);
96 d.WorldSetGravity(world, 0.0f, 0.0f, -0.5f); 96 d.WorldSetGravity(world, 0.0f, 0.0f, -0.5f);
97 //d.WorldSetCFM(world, 1e-5f); 97 //d.WorldSetCFM(world, 1e-5f);
98 d.WorldSetAutoDisableFlag(world, false); 98 d.WorldSetAutoDisableFlag(world, false);
99 d.WorldSetContactSurfaceLayer(world, 0.001f); 99 d.WorldSetContactSurfaceLayer(world, 0.001f);
100 // d.CreatePlane(space, 0, 0, 1, 0); 100 // d.CreatePlane(space, 0, 0, 1, 0);
101 this._heightmap = new double[65536]; 101 this._heightmap = new double[65536];
102 } 102 }
103 103
104 // This function blatantly ripped off from BoxStack.cs 104 // This function blatantly ripped off from BoxStack.cs
105 static private void near(IntPtr space, IntPtr g1, IntPtr g2) 105 static private void near(IntPtr space, IntPtr g1, IntPtr g2)
106 { 106 {
107 //Console.WriteLine("collision callback"); 107 //Console.WriteLine("collision callback");
108 IntPtr b1 = d.GeomGetBody(g1); 108 IntPtr b1 = d.GeomGetBody(g1);
109 IntPtr b2 = d.GeomGetBody(g2); 109 IntPtr b2 = d.GeomGetBody(g2);
110 if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact)) 110 if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
111 return; 111 return;
112 112
113 int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf); 113 int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf);
114 for (int i = 0; i < count; ++i) 114 for (int i = 0; i < count; ++i)
115 { 115 {
116 contact.geom = contacts[i]; 116 contact.geom = contacts[i];
117 IntPtr joint = d.JointCreateContact(world, contactgroup, ref contact); 117 IntPtr joint = d.JointCreateContact(world, contactgroup, ref contact);
118 d.JointAttach(joint, b1, b2); 118 d.JointAttach(joint, b1, b2);
119 } 119 }
120 120
121 } 121 }
122 122
123 public override PhysicsActor AddAvatar(PhysicsVector position) 123 public override PhysicsActor AddAvatar(PhysicsVector position)
124 { 124 {
125 PhysicsVector pos = new PhysicsVector(); 125 PhysicsVector pos = new PhysicsVector();
126 pos.X = position.X; 126 pos.X = position.X;
127 pos.Y = position.Y; 127 pos.Y = position.Y;
128 pos.Z = position.Z + 20; 128 pos.Z = position.Z + 20;
129 OdeCharacter newAv = new OdeCharacter(this, pos); 129 OdeCharacter newAv = new OdeCharacter(this, pos);
130 this._characters.Add(newAv); 130 this._characters.Add(newAv);
131 return newAv; 131 return newAv;
132 } 132 }
133 133
134 public override void RemoveAvatar(PhysicsActor actor) 134 public override void RemoveAvatar(PhysicsActor actor)
135 { 135 {
136 136
137 } 137 }
138 138
139 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) 139 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
140 { 140 {
141 PhysicsVector pos = new PhysicsVector(); 141 PhysicsVector pos = new PhysicsVector();
142 pos.X = position.X; 142 pos.X = position.X;
143 pos.Y = position.Y; 143 pos.Y = position.Y;
144 pos.Z = position.Z; 144 pos.Z = position.Z;
145 PhysicsVector siz = new PhysicsVector(); 145 PhysicsVector siz = new PhysicsVector();
146 siz.X = size.X; 146 siz.X = size.X;
147 siz.Y = size.Y; 147 siz.Y = size.Y;
148 siz.Z = size.Z; 148 siz.Z = size.Z;
149 return new OdePrim(); 149 return new OdePrim();
150 } 150 }
151 151
152 public override void Simulate(float timeStep) 152 public override void Simulate(float timeStep)
153 { 153 {
154 foreach (OdeCharacter actor in _characters) 154 foreach (OdeCharacter actor in _characters)
155 { 155 {
156 actor.Move(timeStep * 5f); 156 actor.Move(timeStep * 5f);
157 } 157 }
158 d.SpaceCollide(space, IntPtr.Zero, nearCallback); 158 d.SpaceCollide(space, IntPtr.Zero, nearCallback);
159 d.WorldQuickStep(world, timeStep * 5f); 159 d.WorldQuickStep(world, timeStep * 5f);
160 d.JointGroupEmpty(contactgroup); 160 d.JointGroupEmpty(contactgroup);
161 foreach (OdeCharacter actor in _characters) 161 foreach (OdeCharacter actor in _characters)
162 { 162 {
163 actor.UpdatePosition(); 163 actor.UpdatePosition();
164 } 164 }
165 165
166 } 166 }
167 167
168 public override void GetResults() 168 public override void GetResults()
169 { 169 {
170 170
171 } 171 }
172 172
173 public override bool IsThreaded 173 public override bool IsThreaded
174 { 174 {
175 get 175 get
176 { 176 {
177 return (false); // for now we won't be multithreaded 177 return (false); // for now we won't be multithreaded
178 } 178 }
179 } 179 }
180 180
181 public override void SetTerrain(float[] heightMap) 181 public override void SetTerrain(float[] heightMap)
182 { 182 {
183 for (int i = 0; i < 65536; i++) 183 for (int i = 0; i < 65536; i++)
184 { 184 {
185 // this._heightmap[i] = (double)heightMap[i]; 185 this._heightmap[i] = (double)heightMap[i];
186 // dbm (danx0r) -- heightmap x,y must be swapped for Ode (should fix ODE, but for now...) 186 }
187 int x = i & 0xff; 187 IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
188 int y = i >> 8; 188 d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 256, 256, 256, 256, 1.0f, 0.0f, 2.0f, 0);
189 this._heightmap[i] = (double)heightMap[x * 256 + y]; 189 d.GeomHeightfieldDataSetBounds(HeightmapData, 256, 256);
190 } 190 LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
191 IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); 191 d.Matrix3 R = new d.Matrix3();
192 d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 256, 256, 256, 256, 1.0f, 0.0f, 2.0f, 0); 192
193 d.GeomHeightfieldDataSetBounds(HeightmapData, 256, 256); 193 Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0));
194 LandGeom = d.CreateHeightfield(space, HeightmapData, 1); 194 Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0));
195 d.Matrix3 R = new d.Matrix3(); 195 //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1));
196 196
197 Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0)); 197 q1 = q1 * q2;
198 Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0)); 198 //q1 = q1 * q3;
199 //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1)); 199 Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3();
200 200 float angle = 0;
201 q1 = q1 * q2; 201 q1.ToAngleAxis(ref angle, ref v3);
202 //q1 = q1 * q3; 202
203 Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(); 203 d.RFromAxisAndAngle(out R, v3.x, v3.y, v3.z, angle);
204 float angle = 0; 204 d.GeomSetRotation(LandGeom, ref R);
205 q1.ToAngleAxis(ref angle, ref v3); 205 d.GeomSetPosition(LandGeom, 128, 128, 0);
206 206 }
207 d.RFromAxisAndAngle(out R, v3.x, v3.y, v3.z, angle); 207
208 d.GeomSetRotation(LandGeom, ref R); 208 public override void DeleteTerrain()
209 d.GeomSetPosition(LandGeom, 128, 128, 0); 209 {
210 } 210
211 211 }
212 public override void DeleteTerrain() 212 }
213 { 213
214 214 public class OdeCharacter : PhysicsActor
215 } 215 {
216 } 216 private PhysicsVector _position;
217 217 private PhysicsVector _velocity;
218 public class OdeCharacter : PhysicsActor 218 private PhysicsVector _acceleration;
219 { 219 private bool flying;
220 private PhysicsVector _position; 220 //private float gravityAccel;
221 private PhysicsVector _velocity; 221 private IntPtr BoundingCapsule;
222 private PhysicsVector _acceleration; 222 IntPtr capsule_geom;
223 private bool flying; 223 d.Mass capsule_mass;
224 //private float gravityAccel; 224
225 private IntPtr BoundingCapsule; 225 public OdeCharacter(OdeScene parent_scene, PhysicsVector pos)
226 IntPtr capsule_geom; 226 {
227 d.Mass capsule_mass; 227 _velocity = new PhysicsVector();
228 228 _position = pos;
229 public OdeCharacter(OdeScene parent_scene, PhysicsVector pos) 229 _acceleration = new PhysicsVector();
230 { 230 d.MassSetCapsule(out capsule_mass, 5.0f, 3, 0.5f, 2f);
231 _velocity = new PhysicsVector(); 231 capsule_geom = d.CreateCapsule(OdeScene.space, 0.5f, 2f);
232 _position = pos; 232 this.BoundingCapsule = d.BodyCreate(OdeScene.world);
233 _acceleration = new PhysicsVector(); 233 d.BodySetMass(BoundingCapsule, ref capsule_mass);
234 d.MassSetCapsule(out capsule_mass, 5.0f, 3, 0.5f, 2f); 234 d.BodySetPosition(BoundingCapsule, pos.X, pos.Y, pos.Z);
235 capsule_geom = d.CreateCapsule(OdeScene.space, 0.5f, 2f); 235 d.GeomSetBody(capsule_geom, BoundingCapsule);
236 this.BoundingCapsule = d.BodyCreate(OdeScene.world); 236 }
237 d.BodySetMass(BoundingCapsule, ref capsule_mass); 237
238 d.BodySetPosition(BoundingCapsule, pos.X, pos.Y, pos.Z); 238 public override bool Flying
239 d.GeomSetBody(capsule_geom, BoundingCapsule); 239 {
240 } 240 get
241 241 {
242 public override bool Flying 242 return flying;
243 { 243 }
244 get 244 set
245 { 245 {
246 return flying; 246 flying = value;
247 } 247 }
248 set 248 }
249 { 249
250 flying = value; 250 public override PhysicsVector Position
251 } 251 {
252 } 252 get
253 253 {
254 public override PhysicsVector Position 254 return _position;
255 { 255 }
256 get 256 set
257 { 257 {
258 return _position; 258 _position = value;
259 } 259 }
260 set 260 }
261 { 261
262 _position = value; 262 public override PhysicsVector Velocity
263 } 263 {
264 } 264 get
265 265 {
266 public override PhysicsVector Velocity 266 return _velocity;
267 { 267 }
268 get 268 set
269 { 269 {
270 return _velocity; 270 _velocity = value;
271 } 271 }
272 set 272 }
273 { 273
274 _velocity = value; 274 public override bool Kinematic
275 } 275 {
276 } 276 get
277 277 {
278 public override bool Kinematic 278 return false;
279 { 279 }
280 get 280 set
281 { 281 {
282 return false; 282
283 } 283 }
284 set 284 }
285 { 285
286 286 public override Axiom.MathLib.Quaternion Orientation
287 } 287 {
288 } 288 get
289 289 {
290 public override Axiom.MathLib.Quaternion Orientation 290 return Axiom.MathLib.Quaternion.Identity;
291 { 291 }
292 get 292 set
293 { 293 {
294 return Axiom.MathLib.Quaternion.Identity; 294
295 } 295 }
296 set 296 }
297 { 297
298 298 public override PhysicsVector Acceleration
299 } 299 {
300 } 300 get
301 301 {
302 public override PhysicsVector Acceleration 302 return _acceleration;
303 { 303 }
304 get 304
305 { 305 }
306 return _acceleration; 306 public void SetAcceleration(PhysicsVector accel)
307 } 307 {
308 308 this._acceleration = accel;
309 } 309 }
310 public void SetAcceleration(PhysicsVector accel) 310
311 { 311 public override void AddForce(PhysicsVector force)
312 this._acceleration = accel; 312 {
313 } 313
314 314 }
315 public override void AddForce(PhysicsVector force) 315
316 { 316 public override void SetMomentum(PhysicsVector momentum)
317 317 {
318 } 318
319 319 }
320 public override void SetMomentum(PhysicsVector momentum) 320
321 { 321 public void Move(float timeStep)
322 322 {
323 } 323 PhysicsVector vec = new PhysicsVector();
324 324 vec.X = this._velocity.X * timeStep;
325 public void Move(float timeStep) 325 vec.Y = this._velocity.Y * timeStep;
326 { 326 if (flying)
327 PhysicsVector vec = new PhysicsVector(); 327 {
328 vec.X = this._velocity.X * timeStep; 328 vec.Z = (this._velocity.Z + 0.5f) * timeStep;
329 vec.Y = this._velocity.Y * timeStep; 329 }
330 if (flying) 330 d.BodySetLinearVel(this.BoundingCapsule, vec.X, vec.Y, vec.Z);
331 { 331 }
332 vec.Z = (this._velocity.Z + 0.5f) * timeStep; 332
333 } 333 public void UpdatePosition()
334 d.BodySetLinearVel(this.BoundingCapsule, vec.X, vec.Y, vec.Z); 334 {
335 } 335 d.Vector3 vec = d.BodyGetPosition(BoundingCapsule);
336 336 this._position.X = vec.X;
337 public void UpdatePosition() 337 this._position.Y = vec.Y;
338 { 338 this._position.Z = vec.Z;
339 d.Vector3 vec = d.BodyGetPosition(BoundingCapsule); 339 }
340 this._position.X = vec.X; 340 }
341 this._position.Y = vec.Y; 341
342 this._position.Z = vec.Z+1.0f; 342 public class OdePrim : PhysicsActor
343 } 343 {
344 } 344 private PhysicsVector _position;
345 345 private PhysicsVector _velocity;
346 public class OdePrim : PhysicsActor 346 private PhysicsVector _acceleration;
347 { 347
348 private PhysicsVector _position; 348 public OdePrim()
349 private PhysicsVector _velocity; 349 {
350 private PhysicsVector _acceleration; 350 _velocity = new PhysicsVector();
351 351 _position = new PhysicsVector();
352 public OdePrim() 352 _acceleration = new PhysicsVector();
353 { 353 }
354 _velocity = new PhysicsVector(); 354 public override bool Flying
355 _position = new PhysicsVector(); 355 {
356 _acceleration = new PhysicsVector(); 356 get
357 } 357 {
358 public override bool Flying 358 return false; //no flying prims for you
359 { 359 }
360 get 360 set
361 { 361 {
362 return false; //no flying prims for you 362
363 } 363 }
364 set 364 }
365 { 365 public override PhysicsVector Position
366 366 {
367 } 367 get
368 } 368 {
369 public override PhysicsVector Position 369 PhysicsVector pos = new PhysicsVector();
370 { 370 // PhysicsVector vec = this._prim.Position;
371 get 371 //pos.X = vec.X;
372 { 372 //pos.Y = vec.Y;
373 PhysicsVector pos = new PhysicsVector(); 373 //pos.Z = vec.Z;
374 // PhysicsVector vec = this._prim.Position; 374 return pos;
375 //pos.X = vec.X; 375
376 //pos.Y = vec.Y; 376 }
377 //pos.Z = vec.Z; 377 set
378 return pos; 378 {
379 379 /*PhysicsVector vec = value;
380 } 380 PhysicsVector pos = new PhysicsVector();
381 set 381 pos.X = vec.X;
382 { 382 pos.Y = vec.Y;
383 /*PhysicsVector vec = value; 383 pos.Z = vec.Z;
384 PhysicsVector pos = new PhysicsVector(); 384 this._prim.Position = pos;*/
385 pos.X = vec.X; 385 }
386 pos.Y = vec.Y; 386 }
387 pos.Z = vec.Z; 387
388 this._prim.Position = pos;*/ 388 public override PhysicsVector Velocity
389 } 389 {
390 } 390 get
391 391 {
392 public override PhysicsVector Velocity 392 return _velocity;
393 { 393 }
394 get 394 set
395 { 395 {
396 return _velocity; 396 _velocity = value;
397 } 397 }
398 set 398 }
399 { 399
400 _velocity = value; 400 public override bool Kinematic
401 } 401 {
402 } 402 get
403 403 {
404 public override bool Kinematic 404 return false;
405 { 405 //return this._prim.Kinematic;
406 get 406 }
407 { 407 set
408 return false; 408 {
409 //return this._prim.Kinematic; 409 //this._prim.Kinematic = value;
410 } 410 }
411 set 411 }
412 { 412
413 //this._prim.Kinematic = value; 413 public override Axiom.MathLib.Quaternion Orientation
414 } 414 {
415 } 415 get
416 416 {
417 public override Axiom.MathLib.Quaternion Orientation 417 Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
418 { 418 return res;
419 get 419 }
420 { 420 set
421 Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion(); 421 {
422 return res; 422
423 } 423 }
424 set 424 }
425 { 425
426 426 public override PhysicsVector Acceleration
427 } 427 {
428 } 428 get
429 429 {
430 public override PhysicsVector Acceleration 430 return _acceleration;
431 { 431 }
432 get 432
433 { 433 }
434 return _acceleration; 434 public void SetAcceleration(PhysicsVector accel)
435 } 435 {
436 436 this._acceleration = accel;
437 } 437 }
438 public void SetAcceleration(PhysicsVector accel) 438
439 { 439 public override void AddForce(PhysicsVector force)
440 this._acceleration = accel; 440 {
441 } 441
442 442 }
443 public override void AddForce(PhysicsVector force) 443
444 { 444 public override void SetMomentum(PhysicsVector momentum)
445 445 {
446 } 446
447 447 }
448 public override void SetMomentum(PhysicsVector momentum) 448
449 { 449
450 450 }
451 } 451
452 452}
453
454 }
455
456}
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
index 68f1aa1..68f1aa1 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
index f25361a..f25361a 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
diff --git a/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
index 913aae7..913aae7 100644
--- a/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
index efe9c79..efe9c79 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 5ab70bb..5ab70bb 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
diff --git a/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
index dff1ee2..dff1ee2 100644
--- a/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs
index dd2b2a9..dd2b2a9 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs
index ccebb24..ccebb24 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs
index 64a7a32..64a7a32 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index 99b86d4..99b86d4 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index 6c1c7d2..6c1c7d2 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
index 0802d75..0802d75 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
diff --git a/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs
index 2299fa4..2299fa4 100644
--- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs
diff --git a/OpenSim.RegionServer/ClientView.Grid.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs
index 5229dbd..a3b191c 100644
--- a/OpenSim.RegionServer/ClientView.Grid.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs
@@ -35,45 +35,38 @@ namespace OpenSim
35 35
36 foreach (Hashtable neighbour in gridServer.neighbours) 36 foreach (Hashtable neighbour in gridServer.neighbours)
37 { 37 {
38 try 38 string neighbourIPStr = (string)neighbour["sim_ip"];
39 { 39 System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);
40 string neighbourIPStr = (string)neighbour["sim_ip"]; 40 ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);
41 System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr); 41 string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();
42 ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]); 42
43 string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString(); 43 Console.WriteLine(reqUrl);
44 44
45 Console.WriteLine(reqUrl); 45 SimParams = new Hashtable();
46 46 SimParams["session_id"] = this.SessionID.ToString();
47 SimParams = new Hashtable(); 47 SimParams["secure_session_id"] = this.SecureSessionID.ToString();
48 SimParams["session_id"] = this.SessionID.ToString(); 48 SimParams["firstname"] = this.ClientAvatar.firstname;
49 SimParams["secure_session_id"] = this.SecureSessionID.ToString(); 49 SimParams["lastname"] = this.ClientAvatar.lastname;
50 SimParams["firstname"] = this.ClientAvatar.firstname; 50 SimParams["agent_id"] = this.AgentID.ToString();
51 SimParams["lastname"] = this.ClientAvatar.lastname; 51 SimParams["circuit_code"] = (Int32)this.CircuitCode;
52 SimParams["agent_id"] = this.AgentID.ToString(); 52 SimParams["child_agent"] = "1";
53 SimParams["circuit_code"] = (Int32)this.CircuitCode; 53 SendParams = new ArrayList();
54 SimParams["child_agent"] = "1"; 54 SendParams.Add(SimParams);
55 SendParams = new ArrayList(); 55
56 SendParams.Add(SimParams); 56 GridReq = new XmlRpcRequest("expect_user", SendParams);
57 57 GridResp = GridReq.Send(reqUrl, 3000);
58 GridReq = new XmlRpcRequest("expect_user", SendParams); 58 EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
59 GridResp = GridReq.Send(reqUrl, 3000); 59 enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
60 EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket(); 60 enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));
61 enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock(); 61
62 enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256)); 62
63 63 byte[] byteIP = neighbourIP.GetAddressBytes();
64 64 enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
65 byte[] byteIP = neighbourIP.GetAddressBytes(); 65 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
66 enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24; 66 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
67 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16; 67 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
68 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8; 68 enablesimpacket.SimulatorInfo.Port = neighbourPort;
69 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0]; 69 enablePackets.Add(enablesimpacket);
70 enablesimpacket.SimulatorInfo.Port = neighbourPort;
71 enablePackets.Add(enablesimpacket);
72 }
73 catch (Exception e)
74 {
75 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing.");
76 }
77 } 70 }
78 Thread.Sleep(3000); 71 Thread.Sleep(3000);
79 foreach (Packet enable in enablePackets) 72 foreach (Packet enable in enablePackets)
diff --git a/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 070c200..75fcf18 100644
--- a/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -98,39 +98,18 @@ namespace OpenSim
98 if (multipleupdate.ObjectData[i].Type == 9) //change position 98 if (multipleupdate.ObjectData[i].Type == 9) //change position
99 { 99 {
100 libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); 100 libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
101 foreach (Entity ent in m_world.Entities.Values) 101 OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
102 {
103 if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
104 {
105 ((OpenSim.world.Primitive)ent).UpdatePosition(pos);
106
107 }
108 }
109 //should update stored position of the prim 102 //should update stored position of the prim
110 } 103 }
111 else if (multipleupdate.ObjectData[i].Type == 10)//rotation 104 else if (multipleupdate.ObjectData[i].Type == 10)//rotation
112 { 105 {
113 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true); 106 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
114 foreach (Entity ent in m_world.Entities.Values) 107 OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
115 {
116 if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
117 {
118 ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);
119 ((OpenSim.world.Primitive)ent).UpdateFlag = true;
120 }
121 }
122 } 108 }
123 else if (multipleupdate.ObjectData[i].Type == 13)//scale 109 else if (multipleupdate.ObjectData[i].Type == 13)//scale
124 { 110 {
125
126 libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12); 111 libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
127 foreach (Entity ent in m_world.Entities.Values) 112 OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
128 {
129 if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
130 {
131 ((OpenSim.world.Primitive)ent).Scale = scale;
132 }
133 }
134 } 113 }
135 } 114 }
136 return true; 115 return true;
diff --git a/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index a78f27a..a6ad8d2 100644
--- a/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -20,17 +20,20 @@ namespace OpenSim
20{ 20{
21 public partial class ClientView 21 public partial class ClientView
22 { 22 {
23 public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 23 public delegate void GenericCall(ClientView remoteClient);
24 public delegate void RezObject(AssetBase primasset, LLVector3 pos);
25 public delegate void ModifyTerrain(byte Action, float North, float West);
26 public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
27 public delegate void StartAnim(LLUUID animID, int seq);
28 public delegate void GenericCall(ClientView RemoteClient);
29 public delegate void GenericCall2(); 24 public delegate void GenericCall2();
30 public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary. 25 public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.
26 public delegate void GenericCall4(Packet packet, ClientView remoteClient);
27 public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
28 public delegate void ObjectSelect(uint localID, ClientView remoteClient);
29 public delegate void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient);
30 public delegate void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient);
31 public delegate void UpdatePrimVector(uint localID, LLVector3 pos, ClientView remoteClient);
32 public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient);
31 33
32 public event ChatFromViewer OnChatFromViewer; 34 public event ChatFromViewer OnChatFromViewer;
33 public event RezObject OnRezObject; 35 public event RezObject OnRezObject;
36 public event GenericCall4 OnDeRezObject;
34 public event ModifyTerrain OnModifyTerrain; 37 public event ModifyTerrain OnModifyTerrain;
35 public event GenericCall OnRegionHandShakeReply; 38 public event GenericCall OnRegionHandShakeReply;
36 public event GenericCall OnRequestWearables; 39 public event GenericCall OnRequestWearables;
@@ -39,6 +42,15 @@ namespace OpenSim
39 public event GenericCall3 OnAgentUpdate; 42 public event GenericCall3 OnAgentUpdate;
40 public event StartAnim OnStartAnim; 43 public event StartAnim OnStartAnim;
41 public event GenericCall OnRequestAvatarsData; 44 public event GenericCall OnRequestAvatarsData;
45 public event LinkObjects OnLinkObjects;
46 public event GenericCall4 OnAddPrim;
47 public event UpdateShape OnUpdatePrimShape;
48 public event ObjectSelect OnObjectSelect;
49 public event UpdatePrimFlags OnUpdatePrimFlags;
50 public event UpdatePrimTexture OnUpdatePrimTexture;
51 public event UpdatePrimVector OnUpdatePrimPosition;
52 public event UpdatePrimRotation OnUpdatePrimRotation;
53 public event UpdatePrimVector OnUpdatePrimScale;
42 54
43 protected override void ProcessInPacket(Packet Pack) 55 protected override void ProcessInPacket(Packet Pack)
44 { 56 {
@@ -62,7 +74,20 @@ namespace OpenSim
62 74
63 switch (Pack.Type) 75 switch (Pack.Type)
64 { 76 {
65 #region New Event system 77 case PacketType.ViewerEffect:
78 ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
79 foreach (ClientView client in m_clientThreads.Values)
80 {
81 if (client.AgentID != this.AgentID)
82 {
83 viewer.AgentData.AgentID = client.AgentID;
84 viewer.AgentData.SessionID = client.SessionID;
85 client.OutPacket(viewer);
86 }
87 }
88 break;
89
90 #region New Event System - World/Avatar
66 case PacketType.ChatFromViewer: 91 case PacketType.ChatFromViewer:
67 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; 92 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
68 if (Util.FieldToString(inchatpack.ChatData.Message) == "") 93 if (Util.FieldToString(inchatpack.ChatData.Message) == "")
@@ -93,153 +118,100 @@ namespace OpenSim
93 } 118 }
94 } 119 }
95 break; 120 break;
121 case PacketType.DeRezObject:
122 OnDeRezObject(Pack, this);
123 break;
96 case PacketType.ModifyLand: 124 case PacketType.ModifyLand:
97 ModifyLandPacket modify = (ModifyLandPacket)Pack; 125 ModifyLandPacket modify = (ModifyLandPacket)Pack;
98 if (modify.ParcelData.Length > 0) 126 if (modify.ParcelData.Length > 0)
99 { 127 {
100 OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West); 128 OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
101 } 129 }
102 break; 130 break;
131 case PacketType.RegionHandshakeReply:
132 OnRegionHandShakeReply(this);
133 break;
134 case PacketType.AgentWearablesRequest:
135 OnRequestWearables(this);
136 OnRequestAvatarsData(this);
137 break;
138 case PacketType.AgentSetAppearance:
139 AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
140 OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
141 break;
142 case PacketType.CompleteAgentMovement:
143 if (this.m_child) this.UpgradeClient();
144 OnCompleteMovementToRegion();
145 this.EnableNeighbours();
146 break;
147 case PacketType.AgentUpdate:
148 OnAgentUpdate(Pack);
149 break;
150 case PacketType.AgentAnimation:
151 if (!m_child)
152 {
153 AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
154 for (int i = 0; i < AgentAni.AnimationList.Length; i++)
155 {
156 if (AgentAni.AnimationList[i].StartAnim)
157 {
158 OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);
159 }
160 }
161 }
162 break;
103 163
104 case PacketType.RegionHandshakeReply:
105 OnRegionHandShakeReply(this);
106 break;
107 case PacketType.AgentWearablesRequest:
108 OnRequestWearables(this);
109 OnRequestAvatarsData(this);
110 break;
111 case PacketType.AgentSetAppearance:
112 AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
113 OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
114 break;
115 case PacketType.CompleteAgentMovement:
116 if (this.m_child) this.UpgradeClient();
117 OnCompleteMovementToRegion();
118 this.EnableNeighbours();
119 break;
120 case PacketType.AgentUpdate:
121 OnAgentUpdate(Pack);
122 break;
123 case PacketType.AgentAnimation:
124 if (!m_child)
125 {
126 AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
127 for (int i = 0; i < AgentAni.AnimationList.Length; i++)
128 {
129 if (AgentAni.AnimationList[i].StartAnim)
130 {
131 OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);
132 }
133 }
134 }
135 break;
136 case PacketType.AgentIsNowWearing:
137 // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
138 //Console.WriteLine(Pack.ToString());
139 break;
140 #endregion 164 #endregion
141 165
142 //old handling, should move most to a event based system. 166 #region New Event System - Objects/Prims
143 #region World/Avatar/Primitive related packets
144 case PacketType.ObjectAdd:
145 m_world.AddNewPrim((ObjectAddPacket)Pack, this);
146 break;
147 case PacketType.ObjectLink: 167 case PacketType.ObjectLink:
148 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); 168 // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
149 ObjectLinkPacket link = (ObjectLinkPacket)Pack; 169 ObjectLinkPacket link = (ObjectLinkPacket)Pack;
150 uint parentprimid = 0; 170 uint parentprimid = 0;
151 OpenSim.world.Primitive parentprim = null; 171 List<uint> childrenprims = new List<uint>();
152 if (link.ObjectData.Length > 1) 172 if (link.ObjectData.Length > 1)
153 { 173 {
154 parentprimid = link.ObjectData[0].ObjectLocalID; 174 parentprimid = link.ObjectData[0].ObjectLocalID;
155 foreach (Entity ent in m_world.Entities.Values)
156 {
157 if (ent.localid == parentprimid)
158 {
159 parentprim = (OpenSim.world.Primitive)ent;
160 175
161 }
162 }
163 for (int i = 1; i < link.ObjectData.Length; i++) 176 for (int i = 1; i < link.ObjectData.Length; i++)
164 { 177 {
165 foreach (Entity ent in m_world.Entities.Values) 178 childrenprims.Add(link.ObjectData[i].ObjectLocalID);
166 {
167 if (ent.localid == link.ObjectData[i].ObjectLocalID)
168 {
169 ((OpenSim.world.Primitive)ent).MakeParent(parentprim);
170 }
171 }
172 } 179 }
173 } 180 }
181 OnLinkObjects(parentprimid, childrenprims);
174 break; 182 break;
175 case PacketType.ObjectScale: 183 case PacketType.ObjectAdd:
176 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); 184 m_world.AddNewPrim((ObjectAddPacket)Pack, this);
185 OnAddPrim(Pack, this);
177 break; 186 break;
178 case PacketType.ObjectShape: 187 case PacketType.ObjectShape:
179 ObjectShapePacket shape = (ObjectShapePacket)Pack; 188 ObjectShapePacket shape = (ObjectShapePacket)Pack;
180 for (int i = 0; i < shape.ObjectData.Length; i++) 189 for (int i = 0; i < shape.ObjectData.Length; i++)
181 { 190 {
182 foreach (Entity ent in m_world.Entities.Values) 191 OnUpdatePrimShape(shape.ObjectData[i].ObjectLocalID, shape.ObjectData[i]);
183 {
184 if (ent.localid == shape.ObjectData[i].ObjectLocalID)
185 {
186 ((OpenSim.world.Primitive)ent).UpdateShape(shape.ObjectData[i]);
187 }
188 }
189 } 192 }
190 break; 193 break;
191 case PacketType.ObjectSelect: 194 case PacketType.ObjectSelect:
192 ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack; 195 ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
193 for (int i = 0; i < incomingselect.ObjectData.Length; i++) 196 for (int i = 0; i < incomingselect.ObjectData.Length; i++)
194 { 197 {
195 foreach (Entity ent in m_world.Entities.Values) 198 OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);
196 {
197 if (ent.localid == incomingselect.ObjectData[i].ObjectLocalID)
198 {
199 ((OpenSim.world.Primitive)ent).GetProperites(this);
200 break;
201 }
202 }
203 } 199 }
204 break; 200 break;
201 case PacketType.ObjectFlagUpdate:
202 ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
203 OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this);
204 break;
205 case PacketType.ObjectImage: 205 case PacketType.ObjectImage:
206 ObjectImagePacket imagePack = (ObjectImagePacket)Pack; 206 ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
207 for (int i = 0; i < imagePack.ObjectData.Length; i++) 207 for (int i = 0; i < imagePack.ObjectData.Length; i++)
208 { 208 {
209 foreach (Entity ent in m_world.Entities.Values) 209 OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this);
210 { 210
211 if (ent.localid == imagePack.ObjectData[i].ObjectLocalID)
212 {
213 ((OpenSim.world.Primitive)ent).UpdateTexture(imagePack.ObjectData[i].TextureEntry);
214 }
215 }
216 }
217 break;
218 case PacketType.ObjectFlagUpdate:
219 ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
220 foreach (Entity ent in m_world.Entities.Values)
221 {
222 if (ent.localid == flags.AgentData.ObjectLocalID)
223 {
224 ((OpenSim.world.Primitive)ent).UpdateObjectFlags(flags);
225 }
226 } 211 }
227 break; 212 break;
213 #endregion
228 214
229 case PacketType.ViewerEffect:
230 ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
231 foreach (ClientView client in m_clientThreads.Values)
232 {
233 if (client.AgentID != this.AgentID)
234 {
235 viewer.AgentData.AgentID = client.AgentID;
236 viewer.AgentData.SessionID = client.SessionID;
237 client.OutPacket(viewer);
238 }
239 }
240 break;
241 #endregion
242
243 #region Inventory/Asset/Other related packets 215 #region Inventory/Asset/Other related packets
244 case PacketType.RequestImage: 216 case PacketType.RequestImage:
245 RequestImagePacket imageRequest = (RequestImagePacket)Pack; 217 RequestImagePacket imageRequest = (RequestImagePacket)Pack;
@@ -464,6 +436,16 @@ namespace OpenSim
464 } 436 }
465 break; 437 break;
466 #endregion 438 #endregion
439
440 #region unimplemented handlers
441 case PacketType.AgentIsNowWearing:
442 // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
443 //Console.WriteLine(Pack.ToString());
444 break;
445 case PacketType.ObjectScale:
446 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
447 break;
448 #endregion
467 } 449 }
468 } 450 }
469 } 451 }
diff --git a/OpenSim.RegionServer/ClientView.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.cs
index ccea2f3..e66b830 100644
--- a/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.cs
@@ -50,7 +50,7 @@ namespace OpenSim
50 /// Handles new client connections 50 /// Handles new client connections
51 /// Constructor takes a single Packet and authenticates everything 51 /// Constructor takes a single Packet and authenticates everything
52 /// </summary> 52 /// </summary>
53 public partial class ClientView : ClientViewBase 53 public partial class ClientView : ClientViewBase, IClientAPI
54 { 54 {
55 protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients 55 protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
56 protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance 56 protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance
@@ -138,7 +138,6 @@ namespace OpenSim
138 { 138 {
139 this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode); 139 this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);
140 m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false); 140 m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);
141 //Console.WriteLine("upgrade start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);
142 } 141 }
143 this.InitNewClient(); 142 this.InitNewClient();
144 } 143 }
diff --git a/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs
index 814b025..572dbce 100644
--- a/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs
@@ -9,11 +9,11 @@ using System.IO;
9using System.Threading; 9using System.Threading;
10using System.Timers; 10using System.Timers;
11using OpenSim.Framework.Utilities; 11using OpenSim.Framework.Utilities;
12 12using OpenSim.Framework.Interfaces;
13 13
14namespace OpenSim 14namespace OpenSim
15{ 15{
16 public class ClientViewBase 16 public class ClientViewBase
17 { 17 {
18 protected BlockingQueue<QueItem> PacketQueue; 18 protected BlockingQueue<QueItem> PacketQueue;
19 protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>(); 19 protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
diff --git a/OpenSim.RegionServer/Grid.cs b/OpenSim-Source/OpenSim.RegionServer/Grid.cs
index db5b8fe..db5b8fe 100644
--- a/OpenSim.RegionServer/Grid.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Grid.cs
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 512ee88..512ee88 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj
diff --git a/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 4ec3537..4ec3537 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs
index 003412d..003412d 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs
diff --git a/OpenSim.RegionServer/OpenSimNetworkHandler.cs b/OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs
index 15ee740..15ee740 100644
--- a/OpenSim.RegionServer/OpenSimNetworkHandler.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs
diff --git a/OpenSim.RegionServer/PacketServer.cs b/OpenSim-Source/OpenSim.RegionServer/PacketServer.cs
index 4ebe023..fb35723 100644
--- a/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/PacketServer.cs
@@ -58,7 +58,7 @@ namespace OpenSim
58 { 58 {
59 if (this._localWorld != null) 59 if (this._localWorld != null)
60 { 60 {
61 ClientView.AddPacketHandler(PacketType.DeRezObject, _localWorld.DeRezObject); 61 //ClientView.AddPacketHandler(PacketType.DeRezObject, _localWorld.DeRezObject);
62 ClientView.AddPacketHandler(PacketType.UUIDNameRequest, this.RequestUUIDName); 62 ClientView.AddPacketHandler(PacketType.UUIDNameRequest, this.RequestUUIDName);
63 } 63 }
64 } 64 }
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs
index f82495a..f82495a 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs
diff --git a/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs
index 42d3030..42d3030 100644
--- a/OpenSim.RegionServer/RegionInfoBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs
diff --git a/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs
index 69a8748..69a8748 100644
--- a/OpenSim.RegionServer/RegionServerBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs
diff --git a/OpenSim.RegionServer/UDPServer.cs b/OpenSim-Source/OpenSim.RegionServer/UDPServer.cs
index 3a93e66..3a93e66 100644
--- a/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/UDPServer.cs
diff --git a/OpenSim.RegionServer/VersionInfo.cs b/OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs
index 49cc6a5..49cc6a5 100644
--- a/OpenSim.RegionServer/VersionInfo.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs
diff --git a/OpenSim.RegionServer/types/Mesh.cs b/OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs
index 3e00c91..3e00c91 100644
--- a/OpenSim.RegionServer/types/Mesh.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs
diff --git a/OpenSim.RegionServer/types/Triangle.cs b/OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs
index 8dfea6e..8dfea6e 100644
--- a/OpenSim.RegionServer/types/Triangle.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs
diff --git a/OpenSim.RegionServer/world/Avatar.Client.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs
index 7656a89..7656a89 100644
--- a/OpenSim.RegionServer/world/Avatar.Client.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs
diff --git a/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs
index 266fc38..e49fab3 100644
--- a/OpenSim.RegionServer/world/Avatar.Update.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs
@@ -93,10 +93,10 @@ namespace OpenSim.world
93 } 93 }
94 94
95 } 95 }
96 public void SendUpdateToOtherClient(Avatar RemoteAvatar) 96 public void SendUpdateToOtherClient(Avatar remoteAvatar)
97 { 97 {
98 ObjectUpdatePacket objupdate = CreateUpdatePacket(); 98 ObjectUpdatePacket objupdate = CreateUpdatePacket();
99 RemoteAvatar.SendPacketToViewer(objupdate); 99 remoteAvatar.SendPacketToViewer(objupdate);
100 } 100 }
101 101
102 public ObjectUpdatePacket CreateUpdatePacket() 102 public ObjectUpdatePacket CreateUpdatePacket()
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
index 4e90364..680d059 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
@@ -6,6 +6,7 @@ using libsecondlife;
6using libsecondlife.Packets; 6using libsecondlife.Packets;
7using OpenSim.Physics.Manager; 7using OpenSim.Physics.Manager;
8using OpenSim.Framework.Inventory; 8using OpenSim.Framework.Inventory;
9using OpenSim.Framework.Interfaces;
9using Axiom.MathLib; 10using Axiom.MathLib;
10 11
11namespace OpenSim.world 12namespace OpenSim.world
@@ -66,11 +67,11 @@ namespace OpenSim.world
66 67
67 //register for events 68 //register for events
68 ControllingClient.OnRequestWearables += new ClientView.GenericCall(this.SendOurAppearance); 69 ControllingClient.OnRequestWearables += new ClientView.GenericCall(this.SendOurAppearance);
69 ControllingClient.OnSetAppearance += new ClientView.SetAppearance(this.SetAppearance); 70 ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
70 ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.CompleteMovement); 71 ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.CompleteMovement);
71 ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.SendInitialPosition); 72 ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.SendInitialPosition);
72 ControllingClient.OnAgentUpdate += new ClientView.GenericCall3(this.HandleAgentUpdate); 73 ControllingClient.OnAgentUpdate += new ClientView.GenericCall3(this.HandleAgentUpdate);
73 ControllingClient.OnStartAnim += new ClientView.StartAnim(this.SendAnimPack); 74 ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
74 75
75 } 76 }
76 77
@@ -349,7 +350,7 @@ namespace OpenSim.world
349 } 350 }
350 351
351 //really really should be moved somewhere else (RegionInfo.cs ?) 352 //really really should be moved somewhere else (RegionInfo.cs ?)
352 public void SendRegionHandshake(World RegionInfo) 353 public void SendRegionHandshake(World regionInfo)
353 { 354 {
354 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet"); 355 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");
355 System.Text.Encoding _enc = System.Text.Encoding.ASCII; 356 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
diff --git a/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs
index b554af8..b554af8 100644
--- a/OpenSim.RegionServer/world/AvatarAnimations.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs
diff --git a/OpenSim.RegionServer/world/Entity.cs b/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
index 96e039a..96e039a 100644
--- a/OpenSim.RegionServer/world/Entity.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs
index e048a9e..e048a9e 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs
index 6d071d4..6d071d4 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs
diff --git a/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs
index a846fb5..a846fb5 100644
--- a/OpenSim.RegionServer/world/SceneObject.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs
diff --git a/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs
index 7d74cb7..348cd30 100644
--- a/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs
@@ -15,31 +15,31 @@ namespace OpenSim.world
15{ 15{
16 public partial class World 16 public partial class World
17 { 17 {
18 public void ModifyTerrain(byte Action, float North, float West) 18 public void ModifyTerrain(byte action, float north, float west)
19 { 19 {
20 switch (Action) 20 switch (action)
21 { 21 {
22 case 1: 22 case 1:
23 // raise terrain 23 // raise terrain
24 Terrain.raise(North, West, 10.0, 0.001); 24 Terrain.raise(north, west, 10.0, 0.1);
25 RegenerateTerrain(true, (int)North, (int)West); 25 RegenerateTerrain(true, (int)north, (int)west);
26 break; 26 break;
27 case 2: 27 case 2:
28 //lower terrain 28 //lower terrain
29 Terrain.lower(North, West, 10.0, 0.001); 29 Terrain.lower(north, west, 10.0, 0.1);
30 RegenerateTerrain(true, (int)North, (int)West); 30 RegenerateTerrain(true, (int)north, (int)west);
31 break; 31 break;
32 } 32 }
33 return; 33 return;
34 } 34 }
35 35
36 public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) 36 public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
37 { 37 {
38 foreach (ClientView client in m_clientThreads.Values) 38 foreach (ClientView client in m_clientThreads.Values)
39 { 39 {
40 // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y)); 40 // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
41 int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(fromPos); 41 int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(fromPos);
42 42
43 switch (type) 43 switch (type)
44 { 44 {
45 case 0: // Whisper 45 case 0: // Whisper
@@ -61,7 +61,7 @@ namespace OpenSim.world
61 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID); 61 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
62 } 62 }
63 break; 63 break;
64 64
65 case 0xff: // Broadcast 65 case 0xff: // Broadcast
66 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID); 66 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
67 break; 67 break;
@@ -70,16 +70,16 @@ namespace OpenSim.world
70 } 70 }
71 } 71 }
72 72
73 public void RezObject(AssetBase primasset, LLVector3 pos) 73 public void RezObject(AssetBase primAsset, LLVector3 pos)
74 { 74 {
75 PrimData primd = new PrimData(primasset.Data); 75 PrimData primd = new PrimData(primAsset.Data);
76 Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this); 76 Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
77 nPrim.CreateFromStorage(primd, pos, this._primCount, true); 77 nPrim.CreateFromStorage(primd, pos, this._primCount, true);
78 this.Entities.Add(nPrim.uuid, nPrim); 78 this.Entities.Add(nPrim.uuid, nPrim);
79 this._primCount++; 79 this._primCount++;
80 } 80 }
81 81
82 public bool DeRezObject(ClientView simClient, Packet packet) 82 public void DeRezObject(Packet packet, ClientView simClient)
83 { 83 {
84 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet; 84 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;
85 85
@@ -165,19 +165,130 @@ namespace OpenSim.world
165 } 165 }
166 } 166 }
167 } 167 }
168 return true; 168
169 } 169 }
170 170
171 public void SendAvatarsToClient(ClientView RemoteClient) 171 public void SendAvatarsToClient(ClientView remoteClient)
172 { 172 {
173 foreach (ClientView client in m_clientThreads.Values) 173 foreach (ClientView client in m_clientThreads.Values)
174 { 174 {
175 if (client.AgentID != RemoteClient.AgentID) 175 if (client.AgentID != remoteClient.AgentID)
176 {
177 // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();
178 // RemoteClient.OutPacket(objupdate);
179 client.ClientAvatar.SendUpdateToOtherClient(remoteClient.ClientAvatar);
180 client.ClientAvatar.SendAppearanceToOtherAgent(remoteClient.ClientAvatar);
181 }
182 }
183 }
184
185 public void LinkObjects(uint parentPrim, List<uint> childPrims)
186 {
187 Primitive parentprim = null;
188 foreach (Entity ent in Entities.Values)
189 {
190 if (ent.localid == parentPrim)
191 {
192 parentprim = (OpenSim.world.Primitive)ent;
193
194 }
195 }
196
197 for (int i = 0; i < childPrims.Count; i++)
198 {
199 uint childId = childPrims[i];
200 foreach (Entity ent in Entities.Values)
201 {
202 if (ent.localid == childId)
203 {
204 ((OpenSim.world.Primitive)ent).MakeParent(parentprim);
205 }
206 }
207 }
208
209 }
210
211 public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
212 {
213 foreach (Entity ent in Entities.Values)
214 {
215 if (ent.localid == primLocalID)
216 {
217 ((OpenSim.world.Primitive)ent).UpdateShape(shapeBlock);
218 break;
219 }
220 }
221 }
222
223 public void SelectPrim(uint primLocalID, ClientView remoteClient)
224 {
225 foreach (Entity ent in Entities.Values)
226 {
227 if (ent.localid == primLocalID)
228 {
229 ((OpenSim.world.Primitive)ent).GetProperites(remoteClient);
230 break;
231 }
232 }
233 }
234
235 public void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient)
236 {
237 foreach (Entity ent in Entities.Values)
238 {
239 if (ent.localid == localID)
240 {
241 ((OpenSim.world.Primitive)ent).UpdateObjectFlags((ObjectFlagUpdatePacket) packet);
242 break;
243 }
244 }
245 }
246
247 public void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient)
248 {
249 foreach (Entity ent in Entities.Values)
250 {
251 if (ent.localid == localID)
252 {
253 ((OpenSim.world.Primitive)ent).UpdateTexture(texture);
254 break;
255 }
256 }
257 }
258
259 public void UpdatePrimPosition(uint localID, LLVector3 pos, ClientView remoteClient)
260 {
261 foreach (Entity ent in Entities.Values)
262 {
263 if (ent.localid == localID)
264 {
265 ((OpenSim.world.Primitive)ent).UpdatePosition(pos);
266 break;
267 }
268 }
269 }
270
271 public void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient)
272 {
273 foreach (Entity ent in Entities.Values)
274 {
275 if (ent.localid == localID)
176 { 276 {
177 // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket(); 277 ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);
178 // RemoteClient.OutPacket(objupdate); 278 ((OpenSim.world.Primitive)ent).UpdateFlag = true;
179 client.ClientAvatar.SendUpdateToOtherClient(RemoteClient.ClientAvatar); 279 break;
180 client.ClientAvatar.SendAppearanceToOtherAgent(RemoteClient.ClientAvatar); 280 }
281 }
282 }
283
284 public void UpdatePrimScale(uint localID, LLVector3 scale, ClientView remoteClient)
285 {
286 foreach (Entity ent in Entities.Values)
287 {
288 if (ent.localid == localID)
289 {
290 ((OpenSim.world.Primitive)ent).Scale = scale;
291 break;
181 } 292 }
182 } 293 }
183 } 294 }
diff --git a/OpenSim.RegionServer/world/World.Scripting.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs
index 44ef05a..44ef05a 100644
--- a/OpenSim.RegionServer/world/World.Scripting.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.cs
index 99fb8e0..921da3c 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.cs
@@ -495,9 +495,9 @@ namespace OpenSim.world
495 } 495 }
496 } 496 }
497 497
498 public void AddNewPrim(ObjectAddPacket addPacket, ClientView AgentClient) 498 public void AddNewPrim(Packet addPacket, ClientView agentClient)
499 { 499 {
500 AddNewPrim(addPacket, AgentClient.AgentID); 500 AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentID);
501 } 501 }
502 502
503 public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID) 503 public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
@@ -533,12 +533,22 @@ namespace OpenSim.world
533 public override void AddViewerAgent(ClientView agentClient) 533 public override void AddViewerAgent(ClientView agentClient)
534 { 534 {
535 //register for events 535 //register for events
536 agentClient.OnChatFromViewer += new ClientView.ChatFromViewer(this.SimChat); 536 agentClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);
537 agentClient.OnRezObject += new ClientView.RezObject(this.RezObject); 537 agentClient.OnRezObject += new RezObject(this.RezObject);
538 agentClient.OnModifyTerrain += new ClientView.ModifyTerrain(this.ModifyTerrain); 538 agentClient.OnModifyTerrain += new ModifyTerrain(this.ModifyTerrain);
539 agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData); 539 agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData);
540 agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims); 540 agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims);
541 agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient); 541 agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient);
542 agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects);
543 agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim);
544 agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape);
545 agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim);
546 agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags);
547 agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture);
548 agentClient.OnUpdatePrimPosition += new ClientView.UpdatePrimVector(this.UpdatePrimPosition);
549 agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation);
550 agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale);
551 agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject);
542 552
543 try 553 try
544 { 554 {
diff --git a/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs
index edc5518..edc5518 100644
--- a/OpenSim.RegionServer/world/WorldBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
index 465c23b..465c23b 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptContext.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
index 2ef16a4..2ef16a4 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
index 15efc49..15efc49 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
diff --git a/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
index 48c18ff..48c18ff 100644
--- a/OpenSim.RegionServer/world/scripting/Script.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
diff --git a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
index 4c6d373..4c6d373 100644
--- a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
diff --git a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
index 6a689ab..6a689ab 100644
--- a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
index 15ef814..15ef814 100644
--- a/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
index f2f0da5..f2f0da5 100644
--- a/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Heap.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Heap.cs
index 138e85e..138e85e 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Heap.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Heap.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
index b94248c..b94248c 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
index 3b7da35..3b7da35 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
index c66c148..c66c148 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
index 6704e31..6704e31 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
index ff18f90..ff18f90 100644
--- a/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
index 2541991..2541991 100644
--- a/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Object.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Object.cs
index e6e392c..e6e392c 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Object.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Object.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index a1e95f4..a1e95f4 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index ae79c83..ae79c83 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
diff --git a/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
index b47bb50..b47bb50 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
index 53a0f08..53a0f08 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Stack.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Stack.cs
index d77d82e..d77d82e 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Stack.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Stack.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
index afca7a9..afca7a9 100644
--- a/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Thread.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Thread.cs
index 436949c..436949c 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Thread.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Thread.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
index 2854eab..2854eab 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
index 270aa7b..270aa7b 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
index da28eaa..da28eaa 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
index 1a3ecff..1a3ecff 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
index 19002d4..19002d4 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
index 91f1679..91f1679 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
index 4ecd325..4ecd325 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index d4db8c0..d4db8c0 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
index 12c5016..12c5016 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
index 885b088..885b088 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
diff --git a/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
index 6610606..6610606 100644
--- a/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 5dceb7f..5dceb7f 100644
--- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
diff --git a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
index db590ff..db590ff 100644
--- a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 6504b77..6504b77 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 8be321d..8be321d 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
diff --git a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
index ba9e139..ba9e139 100644
--- a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
diff --git a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
index 8039721..8039721 100644
--- a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
index 79c27fc..79c27fc 100644
--- a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
diff --git a/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
index fe81f8a..fe81f8a 100644
--- a/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 368405b..368405b 100644
--- a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
diff --git a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
index 5a73897..1cdfaf6 100644
--- a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
@@ -66,10 +66,6 @@
66 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
67 <Private>False</Private> 67 <Private>False</Private>
68 </Reference> 68 </Reference>
69 <Reference Include="System.Drawing" >
70 <HintPath>System.Drawing.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 <Reference Include="System.Data" > 69 <Reference Include="System.Data" >
74 <HintPath>System.Data.dll</HintPath> 70 <HintPath>System.Data.dll</HintPath>
75 <Private>False</Private> 71 <Private>False</Private>
diff --git a/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
index 86c6a5c..e1a3d2d 100644
--- a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
@@ -19,11 +19,10 @@
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="../bin/libTerrain-BSD.dll" />
23 <include name="System.dll" /> 22 <include name="System.dll" />
24 <include name="System.Drawing.dll" />
25 <include name="System.Data.dll" /> 23 <include name="System.Data.dll" />
26 <include name="System.Xml.dll" /> 24 <include name="System.Xml.dll" />
25 <include name="../bin/libTerrain-BSD.dll" />
27 </references> 26 </references>
28 </csc> 27 </csc>
29 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 28 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
index bd74993..bd74993 100644
--- a/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
index a0f37f9..a0f37f9 100644
--- a/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
diff --git a/OpenSim/Application.cs b/OpenSim-Source/OpenSim/Application.cs
index 3f9c0ec..3f9c0ec 100644
--- a/OpenSim/Application.cs
+++ b/OpenSim-Source/OpenSim/Application.cs
diff --git a/OpenSim/OpenSim.csproj b/OpenSim-Source/OpenSim/OpenSim.csproj
index 4456fc7..4456fc7 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim-Source/OpenSim/OpenSim.csproj
diff --git a/OpenSim-Source/OpenSim/OpenSim.csproj.user b/OpenSim-Source/OpenSim/OpenSim.csproj.user
new file mode 100644
index 0000000..1422ebf
--- /dev/null
+++ b/OpenSim-Source/OpenSim/OpenSim.csproj.user
@@ -0,0 +1,13 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <StartArguments>-loginserver -sandbox -accounts</StartArguments>
6 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
7 <LastOpenVersion>8.0.50727</LastOpenVersion>
8 <ProjectView>ProjectFiles</ProjectView>
9 <ProjectTrust>0</ProjectTrust>
10 </PropertyGroup>
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
12 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
13</Project>
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim-Source/OpenSim/OpenSim.exe.build
index 19d0b28..19d0b28 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim-Source/OpenSim/OpenSim.exe.build
diff --git a/OpenSim/OpenSimMain.cs b/OpenSim-Source/OpenSim/OpenSimMain.cs
index 9025316..9025316 100644
--- a/OpenSim/OpenSimMain.cs
+++ b/OpenSim-Source/OpenSim/OpenSimMain.cs
diff --git a/ServiceManager/ServiceManager.csproj b/ServiceManager/ServiceManager.csproj
index f703ef1..ac118c3 100644
--- a/ServiceManager/ServiceManager.csproj
+++ b/ServiceManager/ServiceManager.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>ServiceManager</AssemblyName> 13 <AssemblyName>ServiceManager</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType> 18 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>ServiceManager</RootNamespace> 21 <RootNamespace>ServiceManager</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,18 +61,19 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="System" > 68 <Reference Include="System">
62 <HintPath>System.dll</HintPath> 69 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System.ServiceProcess" > 72 <Reference Include="System.ServiceProcess">
66 <HintPath>System.ServiceProcess.dll</HintPath> 73 <HintPath>System.ServiceProcess.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="System.Xml" > 76 <Reference Include="System.Xml">
70 <HintPath>System.Xml.dll</HintPath> 77 <HintPath>System.Xml.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
@@ -75,7 +82,7 @@
75 </ItemGroup> 82 </ItemGroup>
76 <ItemGroup> 83 <ItemGroup>
77 <Compile Include="ServiceManager.cs"> 84 <Compile Include="ServiceManager.cs">
78 <SubType>Code</SubType> 85 <SubType>Component</SubType>
79 </Compile> 86 </Compile>
80 </ItemGroup> 87 </ItemGroup>
81 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 88 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
@@ -85,4 +92,4 @@
85 <PostBuildEvent> 92 <PostBuildEvent>
86 </PostBuildEvent> 93 </PostBuildEvent>
87 </PropertyGroup> 94 </PropertyGroup>
88</Project> 95</Project> \ No newline at end of file
diff --git a/bin/Shortcut to OpenSim.exe.lnk b/bin/Shortcut to OpenSim.exe.lnk
new file mode 100644
index 0000000..fcb40c7
--- /dev/null
+++ b/bin/Shortcut to OpenSim.exe.lnk
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index e3de61d..e049bd7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -247,155 +247,148 @@
247 <Match pattern="*.cs" recurse="true"/> 247 <Match pattern="*.cs" recurse="true"/>
248 </Files> 248 </Files>
249 </Project> 249 </Project>
250
250 251
251 252 <Project name="OpenSim.Physics.Manager" path="OpenSim.Physics/Manager" type="Library">
252 <!-- OpenGrid Data Services -->
253 <Project name="OpenGrid.Framework.Data" path="OpenGrid.Framework.Data" type="Library">
254 <Configuration name="Debug"> 253 <Configuration name="Debug">
255 <Options> 254 <Options>
256 <OutputPath>../bin/</OutputPath> 255 <OutputPath>../../bin/</OutputPath>
257 </Options> 256 </Options>
258 </Configuration> 257 </Configuration>
259 <Configuration name="Release"> 258 <Configuration name="Release">
260 <Options> 259 <Options>
261 <OutputPath>../bin/</OutputPath> 260 <OutputPath>../../bin/</OutputPath>
262 </Options> 261 </Options>
263 </Configuration> 262 </Configuration>
264 263
265 <ReferencePath>../bin/</ReferencePath> 264 <ReferencePath>../../bin/</ReferencePath>
266 <Reference name="System" localCopy="false"/> 265 <Reference name="System" localCopy="false"/>
267 <Reference name="System.Xml"/> 266 <Reference name="System.Xml" localCopy="false" />
268 <Reference name="System.Data"/> 267 <Reference name="Axiom.MathLib.dll" localCopy="false"/>
269 <Reference name="libsecondlife.dll"/> 268 <Reference name="OpenSim.Framework" localCopy="false"/>
269 <Reference name="OpenSim.Framework.Console" localCopy="false"/>
270 <Files> 270 <Files>
271 <Match pattern="*.cs" recurse="true"/> 271 <Match pattern="*.cs" recurse="false"/>
272 </Files> 272 </Files>
273 </Project> 273 </Project>
274 274
275 <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGrid.Framework.Data.MySQL" type="Library"> 275
276 <!-- Physics Plug-ins -->
277 <Project name="OpenSim.Physics.BasicPhysicsPlugin" path="OpenSim.Physics/BasicPhysicsPlugin" type="Library">
276 <Configuration name="Debug"> 278 <Configuration name="Debug">
277 <Options> 279 <Options>
278 <OutputPath>../bin/</OutputPath> 280 <OutputPath>../../bin/Physics/</OutputPath>
279 </Options> 281 </Options>
280 </Configuration> 282 </Configuration>
281 <Configuration name="Release"> 283 <Configuration name="Release">
282 <Options> 284 <Options>
283 <OutputPath>../bin/</OutputPath> 285 <OutputPath>../../bin/Physics/</OutputPath>
284 </Options> 286 </Options>
285 </Configuration> 287 </Configuration>
286 288
287 <ReferencePath>../bin/</ReferencePath> 289 <ReferencePath>../../bin/</ReferencePath>
288 <Reference name="System" localCopy="false"/> 290 <Reference name="System" localCopy="false"/>
289 <Reference name="System.Xml"/> 291 <Reference name="Axiom.MathLib.dll" localCopy="false"/>
290 <Reference name="System.Data"/> 292 <Reference name="OpenSim.Physics.Manager" localCopy="false"/>
291 <Reference name="OpenGrid.Framework.Data"/>
292 <Reference name="libsecondlife.dll"/>
293 <Reference name="MySql.Data.dll"/>
294 <Files> 293 <Files>
295 <Match pattern="*.cs" recurse="true"/> 294 <Match pattern="*.cs" recurse="true"/>
296 </Files> 295 </Files>
297 </Project> 296 </Project>
298 297
299 <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGrid.Framework.Data.DB4o" type="Library"> 298 <Project name="OpenSim.Physics.PhysXPlugin" path="OpenSim.Physics/PhysXPlugin" type="Library">
300 <Configuration name="Debug"> 299 <Configuration name="Debug">
301 <Options> 300 <Options>
302 <OutputPath>../bin/</OutputPath> 301 <OutputPath>../../bin/Physics/</OutputPath>
303 </Options> 302 </Options>
304 </Configuration> 303 </Configuration>
305 <Configuration name="Release"> 304 <Configuration name="Release">
306 <Options> 305 <Options>
307 <OutputPath>../bin/</OutputPath> 306 <OutputPath>../../bin/Physics/</OutputPath>
308 </Options> 307 </Options>
309 </Configuration> 308 </Configuration>
310 309
311 <ReferencePath>../bin/</ReferencePath> 310 <ReferencePath>../../bin/</ReferencePath>
312 <Reference name="System" localCopy="false"/> 311 <Reference name="System" localCopy="false"/>
313 <Reference name="System.Xml"/> 312 <Reference name="Axiom.MathLib.dll" localCopy="false"/>
314 <Reference name="System.Data"/> 313 <Reference name="PhysX_Wrapper_Dotnet.dll" localCopy="false"/>
315 <Reference name="OpenGrid.Framework.Data"/> 314 <Reference name="OpenSim.Physics.Manager" localCopy="false"/>
316 <Reference name="libsecondlife.dll"/>
317 <Reference name="Db4objects.Db4o.dll"/>
318 <Files> 315 <Files>
319 <Match pattern="*.cs" recurse="true"/> 316 <Match pattern="*.cs" recurse="true"/>
320 </Files> 317 </Files>
321 </Project> 318 </Project>
322 319
323 <Project name="OpenGrid.Framework.Data.MSSQL" path="OpenGrid.Framework.Data.MSSQL" type="Library"> 320 <Project name="OpenSim.Physics.OdePlugin" path="OpenSim.Physics/OdePlugin" type="Library">
324 <Configuration name="Debug"> 321 <Configuration name="Debug">
325 <Options> 322 <Options>
326 <OutputPath>../bin/</OutputPath> 323 <OutputPath>../../bin/Physics/</OutputPath>
327 </Options> 324 </Options>
328 </Configuration> 325 </Configuration>
329 <Configuration name="Release"> 326 <Configuration name="Release">
330 <Options> 327 <Options>
331 <OutputPath>../bin/</OutputPath> 328 <OutputPath>../../bin/Physics/</OutputPath>
332 </Options> 329 </Options>
333 </Configuration> 330 </Configuration>
334 331
335 <ReferencePath>../bin/</ReferencePath> 332 <ReferencePath>../../bin/</ReferencePath>
336 <Reference name="System" localCopy="false"/> 333 <Reference name="System" localCopy="false"/>
337 <Reference name="System.Xml"/> 334 <Reference name="Axiom.MathLib.dll" localCopy="false"/>
338 <Reference name="System.Data"/> 335 <Reference name="OpenSim.Physics.Manager" localCopy="false"/>
339 <Reference name="OpenGrid.Framework.Data"/> 336 <Reference name="Ode.NET.dll" localCopy="false" />
340 <Reference name="libsecondlife.dll"/> 337
341 <Files> 338 <Files>
342 <Match pattern="*.cs" recurse="true"/> 339 <Match pattern="*.cs" recurse="true"/>
343 </Files> 340 </Files>
344 </Project> 341 </Project>
345 342
346 <Project name="OpenGrid.Framework.Data.SQLite" path="OpenGrid.Framework.Data.SQLite" type="Library"> 343 <!-- Xml Config Dll -->
344 <Project name="OpenSim.GenericConfig.Xml" path="OpenSim.GenericConfig/Xml" type="Library">
347 <Configuration name="Debug"> 345 <Configuration name="Debug">
348 <Options> 346 <Options>
349 <OutputPath>../bin/</OutputPath> 347 <OutputPath>../../bin/</OutputPath>
350 </Options> 348 </Options>
351 </Configuration> 349 </Configuration>
352 <Configuration name="Release"> 350 <Configuration name="Release">
353 <Options> 351 <Options>
354 <OutputPath>../bin/</OutputPath> 352 <OutputPath>../../bin/</OutputPath>
355 </Options> 353 </Options>
356 </Configuration> 354 </Configuration>
357 355
358 <ReferencePath>../bin/</ReferencePath> 356 <ReferencePath>../../bin/</ReferencePath>
359 <Reference name="System" localCopy="false"/> 357 <Reference name="System"/>
360 <Reference name="System.Xml"/> 358 <Reference name="System.Xml"/>
361 <Reference name="System.Data"/> 359 <Reference name="OpenSim.Framework"/>
362 <Reference name="System.Data.SQLite.dll"/> 360
363 <Reference name="OpenGrid.Framework.Data"/>
364 <Reference name="libsecondlife.dll"/>
365 <Files> 361 <Files>
366 <Match pattern="*.cs" recurse="true"/> 362 <Match pattern="*.cs" recurse="true"/>
367 </Files> 363 </Files>
368 </Project> 364 </Project>
369 365
370 <!-- OGS projects --> 366 <!-- Basic embedded JVM -->
371 367 <Project name="OpenSim.Scripting.EmbeddedJVM" path="OpenSim.Scripting/EmbeddedJVM" type="Library">
372 <Project name="OpenGrid.Framework.Manager" path="OpenGrid.Framework.Manager" type="Library">
373 <Configuration name="Debug"> 368 <Configuration name="Debug">
374 <Options> 369 <Options>
375 <OutputPath>../bin/</OutputPath> 370 <OutputPath>../../bin/ScriptEngines/</OutputPath>
376 </Options> 371 </Options>
377 </Configuration> 372 </Configuration>
378 <Configuration name="Release"> 373 <Configuration name="Release">
379 <Options> 374 <Options>
380 <OutputPath>../bin/</OutputPath> 375 <OutputPath>../../bin/ScriptEngines/</OutputPath>
381 </Options> 376 </Options>
382 </Configuration> 377 </Configuration>
383 378
384 <ReferencePath>../bin/</ReferencePath> 379 <ReferencePath>../../bin/</ReferencePath>
385 <Reference name="System" localCopy="false"/> 380 <Reference name="System"/>
381 <Reference name="System.Xml"/>
386 <Reference name="OpenSim.Framework"/> 382 <Reference name="OpenSim.Framework"/>
387 <Reference name="OpenSim.Servers"/>
388 <Reference name="libsecondlife.dll"/>
389 <Reference name="XMLRPC"/>
390
391 383
392 <Files> 384 <Files>
393 <Match pattern="*.cs" recurse="true"/> 385 <Match pattern="*.cs" recurse="true"/>
394 </Files> 386 </Files>
395 </Project> 387 </Project>
396 388
397 389
398 <Project name="ServiceManager" path="ServiceManager" type="Exe"> 390 <!-- Terrain engine -->
391 <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim.Terrain.BasicTerrain" type="Library">
399 <Configuration name="Debug"> 392 <Configuration name="Debug">
400 <Options> 393 <Options>
401 <OutputPath>../bin/</OutputPath> 394 <OutputPath>../bin/</OutputPath>
@@ -407,18 +400,19 @@
407 </Options> 400 </Options>
408 </Configuration> 401 </Configuration>
409 402
410 <ReferencePath>../bin/</ReferencePath> 403 <ReferencePath>../bin/</ReferencePath>
411 <Reference name="System" localCopy="false"/> 404 <Reference name="System"/>
412 <Reference name="System.ServiceProcess" localCopy="false"/> 405 <Reference name="System.Drawing"/>
413 <Reference name="System.Xml" localCopy="false"/> 406 <Reference name="System.Data"/>
407 <Reference name="System.Xml"/>
408 <Reference name="libTerrain-BSD.dll"/>
414 409
415 <Files> 410 <Files>
416 <Match pattern="*.cs" recurse="true"/> 411 <Match pattern="*.cs" recurse="true"/>
417 </Files> 412 </Files>
418 </Project> 413 </Project>
419 414
420 415 <Project name="OpenSim.RegionServer" path="OpenSim.RegionServer" type="Library">
421 <Project name="OpenGridServices.GridServer" path="OpenGridServices.GridServer" type="Exe">
422 <Configuration name="Debug"> 416 <Configuration name="Debug">
423 <Options> 417 <Options>
424 <OutputPath>../bin/</OutputPath> 418 <OutputPath>../bin/</OutputPath>
@@ -430,25 +424,27 @@
430 </Options> 424 </Options>
431 </Configuration> 425 </Configuration>
432 426
433 <ReferencePath>../bin/</ReferencePath> 427 <ReferencePath>../bin/</ReferencePath>
434 <Reference name="System" localCopy="false"/> 428 <Reference name="System" localCopy="false"/>
435 <Reference name="System.Data" localCopy="false"/> 429 <Reference name="System.Xml"/>
436 <Reference name="System.Xml" localCopy="false"/> 430 <Reference name="libsecondlife.dll"/>
437 <Reference name="OpenSim.Framework"/> 431 <Reference name="Axiom.MathLib.dll"/>
438 <Reference name="OpenSim.Framework.Console"/> 432 <Reference name="Db4objects.Db4o.dll"/>
439 <Reference name="OpenSim.Servers"/> 433 <Reference name="OpenSim.Terrain.BasicTerrain"/>
440 <Reference name="OpenGrid.Framework.Data"/> 434 <Reference name="OpenSim.Framework"/>
441 <Reference name="OpenGrid.Framework.Manager"/> 435 <Reference name="OpenSim.Framework.Console"/>
442 <Reference name="libsecondlife.dll"/> 436 <Reference name="OpenSim.GenericConfig.Xml"/>
443 <Reference name="Db4objects.Db4o.dll"/> 437 <Reference name="OpenSim.Physics.Manager"/>
444 <Reference name="XMLRPC"/> 438 <Reference name="OpenSim.Servers"/>
439 <Reference name="XMLRPC"/>
445 440
446 <Files> 441 <Files>
447 <Match pattern="*.cs" recurse="true"/> 442 <Match pattern="*.cs" recurse="true"/>
448 </Files> 443 </Files>
449 </Project> 444 </Project>
450 445
451 <Project name="OpenGridServices.AssetServer" path="OpenGridServices.AssetServer" type="Exe"> 446 <!-- OpenSim app -->
447 <Project name="OpenSim" path="OpenSim" type="Exe">
452 <Configuration name="Debug"> 448 <Configuration name="Debug">
453 <Options> 449 <Options>
454 <OutputPath>../bin/</OutputPath> 450 <OutputPath>../bin/</OutputPath>
@@ -460,24 +456,64 @@
460 </Options> 456 </Options>
461 </Configuration> 457 </Configuration>
462 458
463 <ReferencePath>../bin/</ReferencePath> 459 <ReferencePath>../bin/</ReferencePath>
464 <Reference name="System" localCopy="false"/> 460 <Reference name="System" localCopy="false"/>
465 <Reference name="System.Data" localCopy="false"/> 461 <Reference name="System.Xml"/>
466 <Reference name="System.Xml" localCopy="false"/> 462 <Reference name="libsecondlife.dll"/>
467 <Reference name="OpenSim.Framework"/> 463 <Reference name="Axiom.MathLib.dll"/>
468 <Reference name="OpenSim.Framework.Console"/> 464 <Reference name="Db4objects.Db4o.dll"/>
469 <Reference name="OpenSim.GridInterfaces.Local"/> 465 <Reference name="OpenSim.Terrain.BasicTerrain"/>
470 <Reference name="OpenSim.Servers"/> 466 <Reference name="OpenSim.Framework"/>
471 <Reference name="libsecondlife.dll"/> 467 <Reference name="OpenSim.Framework.Console"/>
472 <Reference name="Db4objects.Db4o.dll"/> 468 <Reference name="OpenSim.Physics.Manager"/>
473 <Reference name="XMLRPC"/> 469 <Reference name="OpenSim.Servers"/>
470 <Reference name="OpenSim.RegionServer"/>
471 <Reference name="OpenSim.GenericConfig.Xml"/>
472 <Reference name="XMLRPC"/>
474 473
475 <Files> 474 <Files>
476 <Match pattern="*.cs" recurse="true"/> 475 <Match pattern="*.cs" recurse="true"/>
477 </Files> 476 </Files>
478 </Project> 477 </Project>
478
479</Solution>
480
481
482<Solution name="OpenSim" activeConfig="Debug" path="./">
483 <Configuration name="Debug">
484 <Options>
485 <CompilerDefines>TRACE;DEBUG</CompilerDefines>
486 <OptimizeCode>false</OptimizeCode>
487 <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
488 <AllowUnsafe>false</AllowUnsafe>
489 <WarningLevel>4</WarningLevel>
490 <WarningsAsErrors>false</WarningsAsErrors>
491 <SuppressWarnings></SuppressWarnings>
492 <OutputPath>bin</OutputPath>
493 <DebugInformation>true</DebugInformation>
494 <IncrementalBuild>true</IncrementalBuild>
495 <NoStdLib>false</NoStdLib>
496 </Options>
497 </Configuration>
498 <Configuration name="Release">
499 <Options>
500 <CompilerDefines>TRACE</CompilerDefines>
501 <OptimizeCode>true</OptimizeCode>
502 <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
503 <AllowUnsafe>false</AllowUnsafe>
504 <WarningLevel>4</WarningLevel>
505 <WarningsAsErrors>false</WarningsAsErrors>
506 <SuppressWarnings></SuppressWarnings>
507 <OutputPath>bin</OutputPath>
508 <DebugInformation>false</DebugInformation>
509 <IncrementalBuild>true</IncrementalBuild>
510 <NoStdLib>false</NoStdLib>
511 </Options>
512 </Configuration>
479 513
480 <Project name="OpenGridServices.UserServer" path="OpenGridServices.UserServer" type="Exe"> 514
515 <!-- OpenGrid Data Services -->
516 <Project name="OpenGrid.Framework.Data" path="OpenGrid.Framework.Data" type="Library">
481 <Configuration name="Debug"> 517 <Configuration name="Debug">
482 <Options> 518 <Options>
483 <OutputPath>../bin/</OutputPath> 519 <OutputPath>../bin/</OutputPath>
@@ -488,215 +524,223 @@
488 <OutputPath>../bin/</OutputPath> 524 <OutputPath>../bin/</OutputPath>
489 </Options> 525 </Options>
490 </Configuration> 526 </Configuration>
491
492 <ReferencePath>../bin/</ReferencePath>
493 <Reference name="System" localCopy="false"/>
494 <Reference name="System.Data" localCopy="false"/>
495 <Reference name="System.Xml" localCopy="false"/>
496 <Reference name="OpenSim.Framework"/>
497 <Reference name="OpenSim.Framework.Console"/>
498 <Reference name="OpenGrid.Framework.Data"/>
499 <Reference name="OpenSim.Servers"/>
500 <Reference name="libsecondlife.dll"/>
501 <Reference name="Db4objects.Db4o.dll"/>
502 <Reference name="XMLRPC"/>
503 527
504 <Files> 528 <ReferencePath>../bin/</ReferencePath>
505 <Match pattern="*.cs" recurse="true"/> 529 <Reference name="System" localCopy="false"/>
506 </Files> 530 <Reference name="System.Xml"/>
531 <Reference name="System.Data"/>
532 <Reference name="libsecondlife.dll"/>
533 <Files>
534 <Match pattern="*.cs" recurse="true"/>
535 </Files>
507 </Project> 536 </Project>
508
509 537
510 <Project name="OpenSim.Physics.Manager" path="OpenSim.Physics/Manager" type="Library"> 538 <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGrid.Framework.Data.MySQL" type="Library">
511 <Configuration name="Debug"> 539 <Configuration name="Debug">
512 <Options> 540 <Options>
513 <OutputPath>../../bin/</OutputPath> 541 <OutputPath>../bin/</OutputPath>
514 </Options> 542 </Options>
515 </Configuration> 543 </Configuration>
516 <Configuration name="Release"> 544 <Configuration name="Release">
517 <Options> 545 <Options>
518 <OutputPath>../../bin/</OutputPath> 546 <OutputPath>../bin/</OutputPath>
519 </Options> 547 </Options>
520 </Configuration> 548 </Configuration>
521 549
522 <ReferencePath>../../bin/</ReferencePath> 550 <ReferencePath>../bin/</ReferencePath>
523 <Reference name="System" localCopy="false"/> 551 <Reference name="System" localCopy="false"/>
524 <Reference name="System.Xml" localCopy="false" /> 552 <Reference name="System.Xml"/>
525 <Reference name="Axiom.MathLib.dll" localCopy="false"/> 553 <Reference name="System.Data"/>
526 <Reference name="OpenSim.Framework" localCopy="false"/> 554 <Reference name="OpenGrid.Framework.Data"/>
527 <Reference name="OpenSim.Framework.Console" localCopy="false"/> 555 <Reference name="libsecondlife.dll"/>
556 <Reference name="MySql.Data.dll"/>
528 <Files> 557 <Files>
529 <Match pattern="*.cs" recurse="false"/> 558 <Match pattern="*.cs" recurse="true"/>
530 </Files> 559 </Files>
531 </Project> 560 </Project>
532 561
533 <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGrid.Config/GridConfigDb4o" type="Library"> 562 <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGrid.Framework.Data.DB4o" type="Library">
534 <Configuration name="Debug"> 563 <Configuration name="Debug">
535 <Options> 564 <Options>
536 <OutputPath>../../bin/</OutputPath> 565 <OutputPath>../bin/</OutputPath>
537 </Options> 566 </Options>
538 </Configuration> 567 </Configuration>
539 <Configuration name="Release"> 568 <Configuration name="Release">
540 <Options> 569 <Options>
541 <OutputPath>../../bin/</OutputPath> 570 <OutputPath>../bin/</OutputPath>
542 </Options> 571 </Options>
543 </Configuration> 572 </Configuration>
544 573
545 <ReferencePath>../../bin/</ReferencePath> 574 <ReferencePath>../bin/</ReferencePath>
546 <Reference name="System" localCopy="false"/> 575 <Reference name="System" localCopy="false"/>
547 <Reference name="System.Data.dll"/>
548 <Reference name="System.Xml"/> 576 <Reference name="System.Xml"/>
577 <Reference name="System.Data"/>
578 <Reference name="OpenGrid.Framework.Data"/>
549 <Reference name="libsecondlife.dll"/> 579 <Reference name="libsecondlife.dll"/>
550 <Reference name="Db4objects.Db4o.dll"/> 580 <Reference name="Db4objects.Db4o.dll"/>
551 <Reference name="OpenSim.Framework"/>
552 <Reference name="OpenSim.Framework.Console"/>
553 <Files> 581 <Files>
554 <Match pattern="*.cs" recurse="true"/> 582 <Match pattern="*.cs" recurse="true"/>
555 </Files> 583 </Files>
556 </Project> 584 </Project>
557 585
558 <Project name="OpenUser.Config.UserConfigDb4o" path="OpenUser.Config/UserConfigDb4o" type="Library"> 586 <Project name="OpenGrid.Framework.Data.MSSQL" path="OpenGrid.Framework.Data.MSSQL" type="Library">
559 <Configuration name="Debug"> 587 <Configuration name="Debug">
560 <Options> 588 <Options>
561 <OutputPath>../../bin/</OutputPath> 589 <OutputPath>../bin/</OutputPath>
562 </Options> 590 </Options>
563 </Configuration> 591 </Configuration>
564 <Configuration name="Release"> 592 <Configuration name="Release">
565 <Options> 593 <Options>
566 <OutputPath>../../bin/</OutputPath> 594 <OutputPath>../bin/</OutputPath>
567 </Options> 595 </Options>
568 </Configuration> 596 </Configuration>
569 597
570 <ReferencePath>../../bin/</ReferencePath> 598 <ReferencePath>../bin/</ReferencePath>
571 <Reference name="System" localCopy="false"/> 599 <Reference name="System" localCopy="false"/>
572 <Reference name="System.Data.dll"/>
573 <Reference name="System.Xml"/> 600 <Reference name="System.Xml"/>
601 <Reference name="System.Data"/>
602 <Reference name="OpenGrid.Framework.Data"/>
574 <Reference name="libsecondlife.dll"/> 603 <Reference name="libsecondlife.dll"/>
575 <Reference name="Db4objects.Db4o.dll"/>
576 <Reference name="OpenSim.Framework"/>
577 <Reference name="OpenSim.Framework.Console"/>
578 <Files> 604 <Files>
579 <Match pattern="*.cs" recurse="true"/> 605 <Match pattern="*.cs" recurse="true"/>
580 </Files> 606 </Files>
581 </Project> 607 </Project>
582 608
583 609 <Project name="OpenGrid.Framework.Data.SQLite" path="OpenGrid.Framework.Data.SQLite" type="Library">
584 <!-- Physics Plug-ins -->
585 <Project name="OpenSim.Physics.BasicPhysicsPlugin" path="OpenSim.Physics/BasicPhysicsPlugin" type="Library">
586 <Configuration name="Debug"> 610 <Configuration name="Debug">
587 <Options> 611 <Options>
588 <OutputPath>../../bin/Physics/</OutputPath> 612 <OutputPath>../bin/</OutputPath>
589 </Options> 613 </Options>
590 </Configuration> 614 </Configuration>
591 <Configuration name="Release"> 615 <Configuration name="Release">
592 <Options> 616 <Options>
593 <OutputPath>../../bin/Physics/</OutputPath> 617 <OutputPath>../bin/</OutputPath>
594 </Options> 618 </Options>
595 </Configuration> 619 </Configuration>
596 620
597 <ReferencePath>../../bin/</ReferencePath> 621 <ReferencePath>../bin/</ReferencePath>
598 <Reference name="System" localCopy="false"/> 622 <Reference name="System" localCopy="false"/>
599 <Reference name="Axiom.MathLib.dll" localCopy="false"/> 623 <Reference name="System.Xml"/>
600 <Reference name="OpenSim.Physics.Manager" localCopy="false"/> 624 <Reference name="System.Data"/>
625 <Reference name="System.Data.SQLite.dll"/>
626 <Reference name="OpenGrid.Framework.Data"/>
627 <Reference name="libsecondlife.dll"/>
601 <Files> 628 <Files>
602 <Match pattern="*.cs" recurse="true"/> 629 <Match pattern="*.cs" recurse="true"/>
603 </Files> 630 </Files>
604 </Project> 631 </Project>
605 632
606 <Project name="OpenSim.Physics.PhysXPlugin" path="OpenSim.Physics/PhysXPlugin" type="Library"> 633 <!-- OGS projects -->
634
635 <Project name="OpenGrid.Framework.Manager" path="OpenGrid.Framework.Manager" type="Library">
607 <Configuration name="Debug"> 636 <Configuration name="Debug">
608 <Options> 637 <Options>
609 <OutputPath>../../bin/Physics/</OutputPath> 638 <OutputPath>../bin/</OutputPath>
610 </Options> 639 </Options>
611 </Configuration> 640 </Configuration>
612 <Configuration name="Release"> 641 <Configuration name="Release">
613 <Options> 642 <Options>
614 <OutputPath>../../bin/Physics/</OutputPath> 643 <OutputPath>../bin/</OutputPath>
615 </Options> 644 </Options>
616 </Configuration> 645 </Configuration>
617 646
618 <ReferencePath>../../bin/</ReferencePath> 647 <ReferencePath>../bin/</ReferencePath>
619 <Reference name="System" localCopy="false"/> 648 <Reference name="System" localCopy="false"/>
620 <Reference name="Axiom.MathLib.dll" localCopy="false"/> 649 <Reference name="OpenSim.Framework"/>
621 <Reference name="PhysX_Wrapper_Dotnet.dll" localCopy="false"/> 650 <Reference name="OpenSim.Servers"/>
622 <Reference name="OpenSim.Physics.Manager" localCopy="false"/> 651 <Reference name="libsecondlife.dll"/>
623 <Files> 652 <Reference name="XMLRPC"/>
624 <Match pattern="*.cs" recurse="true"/> 653
625 </Files> 654
655 <Files>
656 <Match pattern="*.cs" recurse="true"/>
657 </Files>
626 </Project> 658 </Project>
627 659
628 <Project name="OpenSim.Physics.OdePlugin" path="OpenSim.Physics/OdePlugin" type="Library"> 660
661 <Project name="ServiceManager" path="ServiceManager" type="Exe">
629 <Configuration name="Debug"> 662 <Configuration name="Debug">
630 <Options> 663 <Options>
631 <OutputPath>../../bin/Physics/</OutputPath> 664 <OutputPath>../bin/</OutputPath>
632 </Options> 665 </Options>
633 </Configuration> 666 </Configuration>
634 <Configuration name="Release"> 667 <Configuration name="Release">
635 <Options> 668 <Options>
636 <OutputPath>../../bin/Physics/</OutputPath> 669 <OutputPath>../bin/</OutputPath>
637 </Options> 670 </Options>
638 </Configuration> 671 </Configuration>
639 672
640 <ReferencePath>../../bin/</ReferencePath> 673 <ReferencePath>../bin/</ReferencePath>
641 <Reference name="System" localCopy="false"/> 674 <Reference name="System" localCopy="false"/>
642 <Reference name="Axiom.MathLib.dll" localCopy="false"/> 675 <Reference name="System.ServiceProcess" localCopy="false"/>
643 <Reference name="OpenSim.Physics.Manager" localCopy="false"/> 676 <Reference name="System.Xml" localCopy="false"/>
644 <Reference name="Ode.NET.dll" localCopy="false" />
645 677
646 <Files> 678 <Files>
647 <Match pattern="*.cs" recurse="true"/> 679 <Match pattern="*.cs" recurse="true"/>
648 </Files> 680 </Files>
649 </Project> 681 </Project>
650 682
651 <!-- Xml Config Dll --> 683
652 <Project name="OpenSim.GenericConfig.Xml" path="OpenSim.GenericConfig/Xml" type="Library"> 684 <Project name="OpenGridServices.GridServer" path="OpenGridServices.GridServer" type="Exe">
653 <Configuration name="Debug"> 685 <Configuration name="Debug">
654 <Options> 686 <Options>
655 <OutputPath>../../bin/</OutputPath> 687 <OutputPath>../bin/</OutputPath>
656 </Options> 688 </Options>
657 </Configuration> 689 </Configuration>
658 <Configuration name="Release"> 690 <Configuration name="Release">
659 <Options> 691 <Options>
660 <OutputPath>../../bin/</OutputPath> 692 <OutputPath>../bin/</OutputPath>
661 </Options> 693 </Options>
662 </Configuration> 694 </Configuration>
663 695
664 <ReferencePath>../../bin/</ReferencePath> 696 <ReferencePath>../bin/</ReferencePath>
665 <Reference name="System"/> 697 <Reference name="System" localCopy="false"/>
666 <Reference name="System.Xml"/> 698 <Reference name="System.Data" localCopy="false"/>
699 <Reference name="System.Xml" localCopy="false"/>
667 <Reference name="OpenSim.Framework"/> 700 <Reference name="OpenSim.Framework"/>
701 <Reference name="OpenSim.Framework.Console"/>
702 <Reference name="OpenSim.Servers"/>
703 <Reference name="OpenGrid.Framework.Data"/>
704 <Reference name="OpenGrid.Framework.Manager"/>
705 <Reference name="libsecondlife.dll"/>
706 <Reference name="Db4objects.Db4o.dll"/>
707 <Reference name="XMLRPC"/>
668 708
669 <Files> 709 <Files>
670 <Match pattern="*.cs" recurse="true"/> 710 <Match pattern="*.cs" recurse="true"/>
671 </Files> 711 </Files>
672 </Project> 712 </Project>
673 713
674 <!-- Basic embedded JVM --> 714 <Project name="OpenGridServices.AssetServer" path="OpenGridServices.AssetServer" type="Exe">
675 <Project name="OpenSim.Scripting.EmbeddedJVM" path="OpenSim.Scripting/EmbeddedJVM" type="Library">
676 <Configuration name="Debug"> 715 <Configuration name="Debug">
677 <Options> 716 <Options>
678 <OutputPath>../../bin/ScriptEngines/</OutputPath> 717 <OutputPath>../bin/</OutputPath>
679 </Options> 718 </Options>
680 </Configuration> 719 </Configuration>
681 <Configuration name="Release"> 720 <Configuration name="Release">
682 <Options> 721 <Options>
683 <OutputPath>../../bin/ScriptEngines/</OutputPath> 722 <OutputPath>../bin/</OutputPath>
684 </Options> 723 </Options>
685 </Configuration> 724 </Configuration>
686 725
687 <ReferencePath>../../bin/</ReferencePath> 726 <ReferencePath>../bin/</ReferencePath>
688 <Reference name="System"/> 727 <Reference name="System" localCopy="false"/>
689 <Reference name="System.Xml"/> 728 <Reference name="System.Data" localCopy="false"/>
729 <Reference name="System.Xml" localCopy="false"/>
690 <Reference name="OpenSim.Framework"/> 730 <Reference name="OpenSim.Framework"/>
731 <Reference name="OpenSim.Framework.Console"/>
732 <Reference name="OpenSim.GridInterfaces.Local"/>
733 <Reference name="OpenSim.Servers"/>
734 <Reference name="libsecondlife.dll"/>
735 <Reference name="Db4objects.Db4o.dll"/>
736 <Reference name="XMLRPC"/>
691 737
692 <Files> 738 <Files>
693 <Match pattern="*.cs" recurse="true"/> 739 <Match pattern="*.cs" recurse="true"/>
694 </Files> 740 </Files>
695 </Project> 741 </Project>
696 742
697 743 <Project name="OpenGridServices.UserServer" path="OpenGridServices.UserServer" type="Exe">
698 <!-- Terrain engine -->
699 <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim.Terrain.BasicTerrain" type="Library">
700 <Configuration name="Debug"> 744 <Configuration name="Debug">
701 <Options> 745 <Options>
702 <OutputPath>../bin/</OutputPath> 746 <OutputPath>../bin/</OutputPath>
@@ -707,91 +751,77 @@
707 <OutputPath>../bin/</OutputPath> 751 <OutputPath>../bin/</OutputPath>
708 </Options> 752 </Options>
709 </Configuration> 753 </Configuration>
754
755 <ReferencePath>../bin/</ReferencePath>
756 <Reference name="System" localCopy="false"/>
757 <Reference name="System.Data" localCopy="false"/>
758 <Reference name="System.Xml" localCopy="false"/>
759 <Reference name="OpenSim.Framework"/>
760 <Reference name="OpenSim.Framework.Console"/>
761 <Reference name="OpenGrid.Framework.Data"/>
762 <Reference name="OpenSim.Servers"/>
763 <Reference name="libsecondlife.dll"/>
764 <Reference name="Db4objects.Db4o.dll"/>
765 <Reference name="XMLRPC"/>
710 766
711 <ReferencePath>../bin/</ReferencePath> 767 <Files>
712 <Reference name="libTerrain-BSD.dll"/> 768 <Match pattern="*.cs" recurse="true"/>
713 <Reference name="System"/> 769 </Files>
714 <Reference name="System.Drawing"/>
715 <Reference name="System.Data"/>
716 <Reference name="System.Xml"/>
717
718 <Files>
719 <Match pattern="*.cs" recurse="true"/>
720 </Files>
721 </Project> 770 </Project>
722 771
723 <Project name="OpenSim.RegionServer" path="OpenSim.RegionServer" type="Library"> 772
773
774 <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGrid.Config/GridConfigDb4o" type="Library">
724 <Configuration name="Debug"> 775 <Configuration name="Debug">
725 <Options> 776 <Options>
726 <OutputPath>../bin/</OutputPath> 777 <OutputPath>../../bin/</OutputPath>
727 </Options> 778 </Options>
728 </Configuration> 779 </Configuration>
729 <Configuration name="Release"> 780 <Configuration name="Release">
730 <Options> 781 <Options>
731 <OutputPath>../bin/</OutputPath> 782 <OutputPath>../../bin/</OutputPath>
732 </Options> 783 </Options>
733 </Configuration> 784 </Configuration>
734 785
735 <ReferencePath>../bin/</ReferencePath> 786 <ReferencePath>../../bin/</ReferencePath>
736 <Reference name="System" localCopy="false"/> 787 <Reference name="System" localCopy="false"/>
788 <Reference name="System.Data.dll"/>
737 <Reference name="System.Xml"/> 789 <Reference name="System.Xml"/>
738 <Reference name="libsecondlife.dll"/> 790 <Reference name="libsecondlife.dll"/>
739 <Reference name="Axiom.MathLib.dll"/>
740 <Reference name="Db4objects.Db4o.dll"/> 791 <Reference name="Db4objects.Db4o.dll"/>
741 <Reference name="OpenSim.Terrain.BasicTerrain"/>
742 <Reference name="OpenSim.Framework"/> 792 <Reference name="OpenSim.Framework"/>
743 <Reference name="OpenSim.Framework.Console"/> 793 <Reference name="OpenSim.Framework.Console"/>
744 <Reference name="OpenSim.GenericConfig.Xml"/>
745 <Reference name="OpenSim.Physics.Manager"/>
746 <Reference name="OpenSim.Servers"/>
747 <Reference name="XMLRPC"/>
748
749 <Files> 794 <Files>
750 <Match pattern="*.cs" recurse="true"/> 795 <Match pattern="*.cs" recurse="true"/>
751 </Files> 796 </Files>
752 </Project> 797 </Project>
753 798
754 <!-- OpenSim app --> 799 <Project name="OpenUser.Config.UserConfigDb4o" path="OpenUser.Config/UserConfigDb4o" type="Library">
755 <Project name="OpenSim" path="OpenSim" type="Exe">
756 <Configuration name="Debug"> 800 <Configuration name="Debug">
757 <Options> 801 <Options>
758 <OutputPath>../bin/</OutputPath> 802 <OutputPath>../../bin/</OutputPath>
759 </Options> 803 </Options>
760 </Configuration> 804 </Configuration>
761 <Configuration name="Release"> 805 <Configuration name="Release">
762 <Options> 806 <Options>
763 <OutputPath>../bin/</OutputPath> 807 <OutputPath>../../bin/</OutputPath>
764 </Options> 808 </Options>
765 </Configuration> 809 </Configuration>
766 810
767 <ReferencePath>../bin/</ReferencePath> 811 <ReferencePath>../../bin/</ReferencePath>
768 <Reference name="System" localCopy="false"/> 812 <Reference name="System" localCopy="false"/>
813 <Reference name="System.Data.dll"/>
769 <Reference name="System.Xml"/> 814 <Reference name="System.Xml"/>
770 <Reference name="libsecondlife.dll"/> 815 <Reference name="libsecondlife.dll"/>
771 <Reference name="Axiom.MathLib.dll"/>
772 <Reference name="Db4objects.Db4o.dll"/> 816 <Reference name="Db4objects.Db4o.dll"/>
773 <Reference name="OpenSim.Terrain.BasicTerrain"/>
774 <Reference name="OpenSim.Framework"/> 817 <Reference name="OpenSim.Framework"/>
775 <Reference name="OpenSim.Framework.Console"/> 818 <Reference name="OpenSim.Framework.Console"/>
776 <Reference name="OpenSim.Physics.Manager"/>
777 <Reference name="OpenSim.Servers"/>
778 <Reference name="OpenSim.RegionServer"/>
779 <Reference name="OpenSim.GenericConfig.Xml"/>
780 <Reference name="XMLRPC"/>
781
782 <Files> 819 <Files>
783 <Match pattern="*.cs" recurse="true"/> 820 <Match pattern="*.cs" recurse="true"/>
784 </Files> 821 </Files>
785 </Project> 822 </Project>
786
787
788 </Solution>
789
790
791
792
793
794 823
824</Solution>
795 825
796 826
797 <!-- Prebuild tool --> 827 <!-- Prebuild tool -->