mirror of
https://github.com/opensim/opensim.git
synced 2026-08-13 05:05:43 +08:00
*Removed SimProfile.cs as it is no longer needed (in favor of SimProfileData)
*Added simulator_data_request XMLRPC method to request data from the grid server about a sim instead of faking its login *Login is progressing, now just getting an XML error (http://pastebin.com/942515) -- if you can fix this, throw MingChen in IRC a Private Message
This commit is contained in:
@@ -170,15 +170,15 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="VersionInfo.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Application.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="OpenSimMain.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="VersionInfo.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
<resources prefix="OpenSim" dynamicprefix="true" >
|
||||
</resources>
|
||||
<sources failonempty="true">
|
||||
<include name="VersionInfo.cs" />
|
||||
<include name="Application.cs" />
|
||||
<include name="OpenSimMain.cs" />
|
||||
<include name="VersionInfo.cs" />
|
||||
</sources>
|
||||
<references basedir="${project::get-base-directory()}">
|
||||
<lib>
|
||||
|
||||
@@ -481,4 +481,4 @@ namespace OpenSim
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -122,34 +122,34 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="ClientStackNetworkHandler.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ClientView.AgentAssetUpload.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ClientView.API.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ClientView.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ClientView.PacketHandlers.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ClientView.ProcessPackets.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ClientViewBase.cs">
|
||||
<Compile Include="ClientStackNetworkHandler.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="PacketServer.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="UDPServer.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ClientView.PacketHandlers.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ClientView.API.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ClientView.ProcessPackets.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="RegionApplicationBase.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="UDPServer.cs">
|
||||
<Compile Include="ClientViewBase.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ClientView.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Assets\InventoryCache.cs">
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
<resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
|
||||
</resources>
|
||||
<sources failonempty="true">
|
||||
<include name="ClientStackNetworkHandler.cs" />
|
||||
<include name="ClientView.AgentAssetUpload.cs" />
|
||||
<include name="ClientView.API.cs" />
|
||||
<include name="ClientView.cs" />
|
||||
<include name="ClientView.PacketHandlers.cs" />
|
||||
<include name="ClientView.ProcessPackets.cs" />
|
||||
<include name="ClientViewBase.cs" />
|
||||
<include name="ClientStackNetworkHandler.cs" />
|
||||
<include name="PacketServer.cs" />
|
||||
<include name="RegionApplicationBase.cs" />
|
||||
<include name="UDPServer.cs" />
|
||||
<include name="ClientView.PacketHandlers.cs" />
|
||||
<include name="ClientView.API.cs" />
|
||||
<include name="ClientView.ProcessPackets.cs" />
|
||||
<include name="RegionApplicationBase.cs" />
|
||||
<include name="ClientViewBase.cs" />
|
||||
<include name="ClientView.cs" />
|
||||
<include name="Assets/InventoryCache.cs" />
|
||||
</sources>
|
||||
<references basedir="${project::get-base-directory()}">
|
||||
|
||||
@@ -98,15 +98,15 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="LocalUserServices.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CommunicationsLocal.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="LocalBackEndServices.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="LocalUserServices.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Properties\AssemblyInfo.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
<resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
|
||||
</resources>
|
||||
<sources failonempty="true">
|
||||
<include name="LocalUserServices.cs" />
|
||||
<include name="CommunicationsLocal.cs" />
|
||||
<include name="LocalBackEndServices.cs" />
|
||||
<include name="LocalUserServices.cs" />
|
||||
<include name="Properties/AssemblyInfo.cs" />
|
||||
</sources>
|
||||
<references basedir="${project::get-base-directory()}">
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Communications.OGS1
|
||||
|
||||
GridParams["authkey"] = serversInfo.GridSendKey;
|
||||
GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated();
|
||||
GridParams["sim_ip"] = regionInfo.InternalEndPoint.Address.ToString();
|
||||
GridParams["sim_ip"] = regionInfo.ExternalHostName;
|
||||
GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString();
|
||||
GridParams["region_locx"] = regionInfo.RegionLocX.ToString();
|
||||
GridParams["region_locy"] = regionInfo.RegionLocY.ToString();
|
||||
@@ -166,6 +166,7 @@ namespace OpenSim.Region.Communications.OGS1
|
||||
// Grid Request Processing
|
||||
public XmlRpcResponse ExpectUser(XmlRpcRequest request)
|
||||
{
|
||||
Console.WriteLine("Expecting User...");
|
||||
Hashtable requestData = (Hashtable)request.Params[0];
|
||||
AgentCircuitData agentData = new AgentCircuitData();
|
||||
agentData.SessionID = new LLUUID((string)requestData["session_id"]);
|
||||
|
||||
@@ -116,16 +116,16 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="CommunicationsOGS1.cs">
|
||||
<Compile Include="OGS1UserServices.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="OGS1GridServices.cs">
|
||||
<Compile Include="CommunicationsOGS1.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="OGS1InterSimComms.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="OGS1UserServices.cs">
|
||||
<Compile Include="OGS1GridServices.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Properties\AssemblyInfo.cs">
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
<resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
|
||||
</resources>
|
||||
<sources failonempty="true">
|
||||
<include name="CommunicationsOGS1.cs" />
|
||||
<include name="OGS1GridServices.cs" />
|
||||
<include name="OGS1InterSimComms.cs" />
|
||||
<include name="OGS1UserServices.cs" />
|
||||
<include name="CommunicationsOGS1.cs" />
|
||||
<include name="OGS1InterSimComms.cs" />
|
||||
<include name="OGS1GridServices.cs" />
|
||||
<include name="Properties/AssemblyInfo.cs" />
|
||||
</sources>
|
||||
<references basedir="${project::get-base-directory()}">
|
||||
|
||||
@@ -154,10 +154,10 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="LlsdMethodEntry.cs">
|
||||
<Compile Include="MyWorld.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="MyWorld.cs">
|
||||
<Compile Include="LlsdMethodEntry.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Program.cs">
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
<resources prefix="SimpleApp" dynamicprefix="true" >
|
||||
</resources>
|
||||
<sources failonempty="true">
|
||||
<include name="LlsdMethodEntry.cs" />
|
||||
<include name="MyWorld.cs" />
|
||||
<include name="LlsdMethodEntry.cs" />
|
||||
<include name="Program.cs" />
|
||||
<include name="Properties/AssemblyInfo.cs" />
|
||||
</sources>
|
||||
|
||||
@@ -93,9 +93,6 @@
|
||||
<Compile Include="AssemblyInfo.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Db4LocalStorage.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="MapStorage.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
@@ -105,6 +102,9 @@
|
||||
<Compile Include="UUIDPrimQuery.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Db4LocalStorage.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
</resources>
|
||||
<sources failonempty="true">
|
||||
<include name="AssemblyInfo.cs" />
|
||||
<include name="Db4LocalStorage.cs" />
|
||||
<include name="MapStorage.cs" />
|
||||
<include name="UUIDParcelQuery.cs" />
|
||||
<include name="UUIDPrimQuery.cs" />
|
||||
<include name="Db4LocalStorage.cs" />
|
||||
</sources>
|
||||
<references basedir="${project::get-base-directory()}">
|
||||
<lib>
|
||||
|
||||
Reference in New Issue
Block a user