aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs3
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj61
-rw-r--r--Common/OpenGrid.Framework.Communications/CommunicationsManager.cs2
-rw-r--r--Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user2
-rw-r--r--Common/OpenSim.Framework/Interfaces/IClientAPI.cs15
5 files changed, 45 insertions, 38 deletions
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
index 0784ffa..308e00f 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
@@ -1,12 +1,13 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.Framework.Types;
4using OpenGrid.Framework.Communications; 5using OpenGrid.Framework.Communications;
5namespace OpenGrid.Framework.Communications.OGS1 6namespace OpenGrid.Framework.Communications.OGS1
6{ 7{
7 public class GridCommsManager : CommunicationsManager 8 public class GridCommsManager : CommunicationsManager
8 { 9 {
9 public GridCommsManager() 10 public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
10 { 11 {
11 GridServer = new OGS1GridServices(); 12 GridServer = new OGS1GridServices();
12 InterRegion = new OGSInterSimComms(); 13 InterRegion = new OGSInterSimComms();
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
index 4a80635..3f4f22d 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
@@ -1,13 +1,12 @@
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>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{C1F40DD4-A68B-4233-9142-CE236775A3CE}</ProjectGuid> 6 <ProjectGuid>{17442AF1-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName> 12 <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace> 19 <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,23 +55,22 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="libsecondlife.dll"> 61 <Reference Include="libsecondlife.dll" >
69 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System"> 65 <Reference Include="System" >
73 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Data"> 69 <Reference Include="System.Data" >
77 <HintPath>System.Data.dll</HintPath> 70 <HintPath>System.Data.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="System.Xml"> 73 <Reference Include="System.Xml" >
81 <HintPath>System.Xml.dll</HintPath> 74 <HintPath>System.Xml.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
@@ -87,44 +80,52 @@
87 <Name>OpenGrid.Framework.Communications</Name> 80 <Name>OpenGrid.Framework.Communications</Name>
88 <Project>{683344D5-0000-0000-0000-000000000000}</Project> 81 <Project>{683344D5-0000-0000-0000-000000000000}</Project>
89 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
90 <Private>False</Private> 83 <Private>False</Private>
91 </ProjectReference> 84 </ProjectReference>
92 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> 85 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
93 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
94 <Name>OpenGrid.Framework.Data</Name> 86 <Name>OpenGrid.Framework.Data</Name>
87 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private>
95 </ProjectReference> 90 </ProjectReference>
96 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 91 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
97 <Name>OpenSim.Framework</Name> 92 <Name>OpenSim.Framework</Name>
98 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 93 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
99 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 94 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
100 <Private>False</Private> 95 <Private>False</Private>
101 </ProjectReference> 96 </ProjectReference>
102 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 97 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
103 <Name>OpenSim.Framework.Console</Name> 98 <Name>OpenSim.Framework.Console</Name>
104 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 99 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
105 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 100 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
106 <Private>False</Private> 101 <Private>False</Private>
107 </ProjectReference> 102 </ProjectReference>
108 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> 103 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
109 <Name>OpenSim.Servers</Name> 104 <Name>OpenSim.Servers</Name>
110 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 105 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
111 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
112 <Private>False</Private> 107 <Private>False</Private>
113 </ProjectReference> 108 </ProjectReference>
114 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> 109 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
115 <Name>XMLRPC</Name> 110 <Name>XMLRPC</Name>
116 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 111 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
117 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 112 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
118 <Private>False</Private> 113 <Private>False</Private>
119 </ProjectReference> 114 </ProjectReference>
120 </ItemGroup> 115 </ItemGroup>
121 <ItemGroup> 116 <ItemGroup>
122 <Compile Include="GridCommsManager.cs" /> 117 <Compile Include="GridCommsManager.cs">
118 <SubType>Code</SubType>
119 </Compile>
123 <Compile Include="OGS1GridServices.cs"> 120 <Compile Include="OGS1GridServices.cs">
124 <SubType>Code</SubType> 121 <SubType>Code</SubType>
125 </Compile> 122 </Compile>
126 <Compile Include="OGSInterSimComms.cs" /> 123 <Compile Include="OGSInterSimComms.cs">
127 <Compile Include="OGSUserServices.cs" /> 124 <SubType>Code</SubType>
125 </Compile>
126 <Compile Include="OGSUserServices.cs">
127 <SubType>Code</SubType>
128 </Compile>
128 <Compile Include="Properties\AssemblyInfo.cs"> 129 <Compile Include="Properties\AssemblyInfo.cs">
129 <SubType>Code</SubType> 130 <SubType>Code</SubType>
130 </Compile> 131 </Compile>
@@ -136,4 +137,4 @@
136 <PostBuildEvent> 137 <PostBuildEvent>
137 </PostBuildEvent> 138 </PostBuildEvent>
138 </PropertyGroup> 139 </PropertyGroup>
139</Project> \ No newline at end of file 140</Project>
diff --git a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
index 2ed4fd2..8d8a647 100644
--- a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
@@ -43,7 +43,7 @@ namespace OpenGrid.Framework.Communications
43 public IGridServices GridServer; 43 public IGridServices GridServer;
44 public IInterRegionCommunications InterRegion; 44 public IInterRegionCommunications InterRegion;
45 45
46 public CommunicationsManager() 46 public CommunicationsManager(NetworkServersInfo serversInfo)
47 { 47 {
48 48
49 } 49 }
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
index ae8a33c..5941547 100644
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
@@ -2,7 +2,7 @@
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>E:\work\oslauth\sim\branches\Sugilite\bin\</ReferencePath> 5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion> 6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView> 7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust> 8 <ProjectTrust>0</ProjectTrust>
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index 9028d8d..009648c 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -55,11 +55,12 @@ namespace OpenSim.Framework.Interfaces
55 public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); 55 public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
56 public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); 56 public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);
57 public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); 57 public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient);
58 public delegate void UpdatePrimVector(uint localID, LLVector3 pos, IClientAPI remoteClient); 58 public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient);
59 public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); 59 public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);
60 public delegate void StatusChange(bool status); 60 public delegate void StatusChange(bool status);
61 public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status); 61 public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);
62 public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation); 62 public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
63 public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient);
63 64
64 public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client); 65 public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);
65 public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client); 66 public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);
@@ -86,14 +87,17 @@ namespace OpenSim.Framework.Interfaces
86 event UpdateAgent OnAgentUpdate; 87 event UpdateAgent OnAgentUpdate;
87 event GenericCall OnRequestAvatarsData; 88 event GenericCall OnRequestAvatarsData;
88 event GenericCall4 OnAddPrim; 89 event GenericCall4 OnAddPrim;
90 event UpdateVector OnGrapObject;
91 event ObjectSelect OnDeGrapObject;
92 event MoveObject OnGrapUpdate;
89 93
90 event UpdateShape OnUpdatePrimShape; 94 event UpdateShape OnUpdatePrimShape;
91 event ObjectSelect OnObjectSelect; 95 event ObjectSelect OnObjectSelect;
92 event UpdatePrimFlags OnUpdatePrimFlags; 96 event UpdatePrimFlags OnUpdatePrimFlags;
93 event UpdatePrimTexture OnUpdatePrimTexture; 97 event UpdatePrimTexture OnUpdatePrimTexture;
94 event UpdatePrimVector OnUpdatePrimPosition; 98 event UpdateVector OnUpdatePrimPosition;
95 event UpdatePrimRotation OnUpdatePrimRotation; 99 event UpdatePrimRotation OnUpdatePrimRotation;
96 event UpdatePrimVector OnUpdatePrimScale; 100 event UpdateVector OnUpdatePrimScale;
97 event StatusChange OnChildAgentStatus; 101 event StatusChange OnChildAgentStatus;
98 event GenericCall2 OnStopMovement; 102 event GenericCall2 OnStopMovement;
99 event NewAvatar OnNewAvatar; 103 event NewAvatar OnNewAvatar;
@@ -143,13 +147,14 @@ namespace OpenSim.Framework.Interfaces
143 void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags); 147 void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags);
144 void SendTeleportCancel(); 148 void SendTeleportCancel();
145 void SendTeleportLocationStart(); 149 void SendTeleportLocationStart();
150 void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance);
146 151
147 void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry); 152 void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry);
148 void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity); 153 void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);
149 154
150 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); 155 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
151 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID); 156 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID , uint flags);
152 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID); 157 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags);
153 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation); 158 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
154 } 159 }
155} 160}