OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*Added UUIDNameRequest packet support (untested, but should work -- at least in sandbox mode) 

*Various small renamings
Sugilite
mingchen 2007-06-28 19:09:50 +00:00
parent 41f26668d9
commit fe0528b98c
21 changed files with 163 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
OpenGridServices.sln
View File

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C# Express 2005
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@ -25,61 +25,72 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

18
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@ -30,9 +30,11 @@ using System.Collections;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework;
using OpenSim.Framework.Data;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using libsecondlife;
using libsecondlife.Packets;
namespace OpenSim.Framework.Communications
{
@ -48,5 +50,21 @@ namespace OpenSim.Framework.Communications
{
ServersInfo = serversInfo;
}
#region Packet Handlers
public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
{
UserProfileData profileData = this.UserServer.GetUserProfile(uuid);
if (profileData != null)
{
UUIDNameReplyPacket packet = new UUIDNameReplyPacket();
packet.UUIDNameBlock[0].ID = profileData.UUID;
packet.UUIDNameBlock[0].FirstName = libsecondlife.Helpers.StringToField(profileData.username);
packet.UUIDNameBlock[0].LastName = libsecondlife.Helpers.StringToField(profileData.surname);
remote_client.OutPacket((Packet)packet);
}
}
#endregion
}
}

4
OpenSim/Framework/General/Interfaces/IClientAPI.cs
View File

@ -69,6 +69,8 @@ namespace OpenSim.Framework.Interfaces
public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);
public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);
public interface IClientAPI
{
event ChatFromViewer OnChatFromViewer;
@ -103,6 +105,8 @@ namespace OpenSim.Framework.Interfaces
event NewAvatar OnNewAvatar;
event GenericCall6 OnRemoveAvatar;
event UUIDNameRequest OnNameFromUUIDRequest;
event ParcelPropertiesRequest OnParcelPropertiesRequest;
event ParcelDivideRequest OnParcelDivideRequest;
event ParcelJoinRequest OnParcelJoinRequest;

4
OpenSim/Framework/General/OpenSim.Framework.csproj
View File

@ -133,10 +133,10 @@
<Compile Include="Interfaces\IWorld.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IClientAPI.cs">
<Compile Include="Interfaces\ILocalStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\ILocalStorage.cs">
<Compile Include="Interfaces\IClientAPI.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IGenericConfig.cs">

2
OpenSim/Framework/General/OpenSim.Framework.dll.build
View File

@ -26,8 +26,8 @@
<include name="Interfaces/IUserServer.cs" />
<include name="Interfaces/IAssetServer.cs" />
<include name="Interfaces/IWorld.cs" />
<include name="Interfaces/IClientAPI.cs" />
<include name="Interfaces/ILocalStorage.cs" />
<include name="Interfaces/IClientAPI.cs" />
<include name="Interfaces/Config/IGenericConfig.cs" />
<include name="Interfaces/Config/IUserConfig.cs" />
<include name="Interfaces/Config/IGridConfig.cs" />

8
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -64,8 +64,8 @@ namespace OpenSim
public class OpenSimMain : RegionApplicationBase, conscmd_callback
{
// private CheckSumServer checkServer;
protected CommunicationsManager commsManager;
// private CheckSumServer checkServer;
private bool m_silent;
private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";
@ -106,14 +106,12 @@ namespace OpenSim
ClientView.TerrainManager = new TerrainManager(new SecondLife());
CommunicationsLocal sandboxCommunications = null;
if (m_sandbox)
{
this.SetupLocalGridServers();
// this.checkServer = new CheckSumServer(12036);
// this.checkServer.ServerListener();
sandboxCommunications = new CommunicationsLocal(this.serversData);
this.commsManager = sandboxCommunications;
this.commsManager = new CommunicationsLocal(this.serversData);
}
else
{
@ -136,7 +134,7 @@ namespace OpenSim
if (m_sandbox)
{
httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);
httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
}
//Start http server

6
OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
View File

@ -114,9 +114,6 @@
<Compile Include="LLSDType.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDHelpers.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDCapEvent.cs">
<SubType>Code</SubType>
</Compile>
@ -132,6 +129,9 @@
<Compile Include="LLSDMapLayer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDHelpers.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>

2
OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
View File

@ -17,12 +17,12 @@
<include name="LLSDTest.cs" />
<include name="LLSDUploadReply.cs" />
<include name="LLSDType.cs" />
<include name="LLSDHelpers.cs" />
<include name="LLSDCapEvent.cs" />
<include name="LLSDMapRequest.cs" />
<include name="Caps.cs" />
<include name="LLSDMapLayerResponse.cs" />
<include name="LLSDMapLayer.cs" />
<include name="LLSDHelpers.cs" />
</sources>
<references basedir="${project::get-base-directory()}">
<lib>

3
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@ -68,6 +68,8 @@ namespace OpenSim.Region.ClientStack
public event GenericCall6 OnRemoveAvatar;
public event RequestMapBlocks OnRequestMapBlocks;
public event TeleportLocationRequest OnTeleportLocationRequest;
public event UUIDNameRequest OnNameFromUUIDRequest;
public event ParcelPropertiesRequest OnParcelPropertiesRequest;
public event ParcelDivideRequest OnParcelDivideRequest;
@ -75,7 +77,6 @@ namespace OpenSim.Region.ClientStack
public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
public event EstateOwnerMessageRequest OnEstateOwnerMessage;
/// <summary>
///
/// </summary>

2
OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
View File

@ -192,7 +192,5 @@ namespace OpenSim.Region.ClientStack
this.OutPacket(mbReply);
*/
}
}
}

8
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
View File

@ -492,7 +492,13 @@ namespace OpenSim.Region.ClientStack
case PacketType.MoneyBalanceRequest:
this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
break;
case PacketType.UUIDNameRequest:
UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
{
OnNameFromUUIDRequest(UUIDBlock.ID, this);
}
break;
#region Parcel related packets
case PacketType.ParcelPropertiesRequest:
ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;

18
OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
View File

@ -134,24 +134,24 @@
<Compile Include="UDPServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientViewBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.PacketHandlers.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionApplicationBase.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="ClientViewBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Assets\InventoryCache.cs">
<SubType>Code</SubType>
</Compile>

8
OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
View File

@ -15,12 +15,12 @@
<include name="ClientStackNetworkHandler.cs" />
<include name="PacketServer.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="ClientView.PacketHandlers.cs" />
<include name="RegionApplicationBase.cs" />
<include name="ClientView.API.cs" />
<include name="ClientView.ProcessPackets.cs" />
<include name="Assets/InventoryCache.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

2
OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
View File

@ -12,7 +12,7 @@ namespace OpenSim.Region.Communications.OGS1
{
GridServer = gridInterComms;
InterRegion = gridInterComms;
UserServer = new OGSUserServices(this);
UserServer = new OGS1UserServices(this);
}
}
}

0
OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs → OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
View File

10
OpenSim/Region/Communications/OGS1/OGSUserServices.cs → OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -11,16 +11,22 @@ using Nwc.XmlRpc;
namespace OpenSim.Region.Communications.OGS1
{
public class OGSUserServices :IUserServices
public class OGS1UserServices :IUserServices
{
CommunicationsOGS1 m_parent;
public OGSUserServices(CommunicationsOGS1 parent)
public OGS1UserServices(CommunicationsOGS1 parent)
{
m_parent = parent;
}
public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
{
if (data.Contains("error_type"))
{
Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] + "): " + data["error_desc"]);
return null;
}
UserProfileData userData = new UserProfileData();
userData.username = (string)data["firstname"];
userData.surname = (string)data["lastname"];

51
OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
View File

@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
@ -6,8 +6,7 @@
<ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>
</ApplicationIcon>
<ApplicationIcon></ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName>
@ -16,11 +15,9 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<AppDesignerFolder>
</AppDesignerFolder>
<AppDesignerFolder></AppDesignerFolder>
<RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace>
<StartupObject>
</StartupObject>
<StartupObject></StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
</PropertyGroup>
@ -31,8 +28,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DocumentationFile></DocumentationFile>
<DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize>
@ -41,8 +37,7 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<NoWarn>
</NoWarn>
<NoWarn></NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@ -51,8 +46,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DocumentationFile></DocumentationFile>
<DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize>
@ -61,31 +55,30 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<NoWarn>
</NoWarn>
<NoWarn></NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="libsecondlife.dll">
<Reference Include="libsecondlife.dll" >
<HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System">
<Reference Include="System" >
<HintPath>System.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Data">
<Reference Include="System.Data" >
<HintPath>System.Data.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Runtime.Remoting">
<Reference Include="System.Runtime.Remoting" >
<HintPath>System.Runtime.Remoting.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Xml">
<Reference Include="System.Xml" >
<HintPath>System.Xml.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="XMLRPC.dll">
<Reference Include="XMLRPC.dll" >
<HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
<Private>False</Private>
</Reference>
@ -95,35 +88,35 @@
<Name>OpenSim.Framework</Name>
<Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
<Name>OpenSim.Framework.Communications</Name>
<Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name>
<Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
<Name>OpenSim.Framework.Data</Name>
<Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
<Name>OpenSim.Framework.Servers</Name>
<Project>{2CC71860-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="OGSInterSimComms.cs">
<Compile Include="OGS1InterSimComms.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="OGS1GridServices.cs">
@ -132,7 +125,7 @@
<Compile Include="CommunicationsOGS1.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="OGSUserServices.cs">
<Compile Include="OGS1UserServices.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
@ -146,4 +139,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>

6
OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
View File

@ -11,10 +11,10 @@
<resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="OGSInterSimComms.cs" />
<include name="OGS1InterSimComms.cs" />
<include name="OGS1GridServices.cs" />
<include name="GridCommsManager.cs" />
<include name="OGSUserServices.cs" />
<include name="CommunicationsOGS1.cs" />
<include name="OGS1UserServices.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

6
OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
View File

@ -163,9 +163,6 @@
<Compile Include="Scenes\SceneEvents.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\ScenePresence.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\ScenePresence.Animations.cs">
<SubType>Code</SubType>
</Compile>
@ -187,6 +184,9 @@
<Compile Include="Scenes\SceneBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\ScenePresence.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\Scene.cs">
<SubType>Code</SubType>
</Compile>

2
OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
View File

@ -16,7 +16,6 @@
<include name="ParcelManager.cs" />
<include name="Scenes/ScenePresence.Body.cs" />
<include name="Scenes/SceneEvents.cs" />
<include name="Scenes/ScenePresence.cs" />
<include name="Scenes/ScenePresence.Animations.cs" />
<include name="Scenes/Scene.PacketHandlers.cs" />
<include name="Scenes/SceneObject.cs" />
@ -24,6 +23,7 @@
<include name="Scenes/IScenePresenceBody.cs" />
<include name="Scenes/Entity.cs" />
<include name="Scenes/SceneBase.cs" />
<include name="Scenes/ScenePresence.cs" />
<include name="Scenes/Scene.cs" />
<include name="Scenes/scripting/ScriptManager.cs" />
<include name="Scenes/scripting/ScriptInfo.cs" />

3
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -505,6 +505,7 @@ namespace OpenSim.Region.Environment.Scenes
remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
//remoteClient.OnObjectSelect += this.SelectPrim;
remoteClient.OnGrapUpdate += this.MoveObject;
remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
/* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
@ -512,7 +513,7 @@ namespace OpenSim.Region.Environment.Scenes
remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
*/
ScenePresence newAvatar = null;
try
{