diff options
Diffstat (limited to '')
4 files changed, 25 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 69b5da6..b17b37b 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -30,9 +30,11 @@ using System.Collections; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Data; | ||
33 | using OpenSim.Framework.Interfaces; | 34 | using OpenSim.Framework.Interfaces; |
34 | using OpenSim.Framework.Types; | 35 | using OpenSim.Framework.Types; |
35 | using libsecondlife; | 36 | using libsecondlife; |
37 | using libsecondlife.Packets; | ||
36 | 38 | ||
37 | namespace OpenSim.Framework.Communications | 39 | namespace OpenSim.Framework.Communications |
38 | { | 40 | { |
@@ -48,5 +50,21 @@ namespace OpenSim.Framework.Communications | |||
48 | { | 50 | { |
49 | ServersInfo = serversInfo; | 51 | ServersInfo = serversInfo; |
50 | } | 52 | } |
53 | |||
54 | #region Packet Handlers | ||
55 | public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) | ||
56 | { | ||
57 | UserProfileData profileData = this.UserServer.GetUserProfile(uuid); | ||
58 | if (profileData != null) | ||
59 | { | ||
60 | UUIDNameReplyPacket packet = new UUIDNameReplyPacket(); | ||
61 | packet.UUIDNameBlock[0].ID = profileData.UUID; | ||
62 | packet.UUIDNameBlock[0].FirstName = libsecondlife.Helpers.StringToField(profileData.username); | ||
63 | packet.UUIDNameBlock[0].LastName = libsecondlife.Helpers.StringToField(profileData.surname); | ||
64 | remote_client.OutPacket((Packet)packet); | ||
65 | } | ||
66 | |||
67 | } | ||
68 | #endregion | ||
51 | } | 69 | } |
52 | } | 70 | } |
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs index 009648c..4e8ac1a 100644 --- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs +++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs | |||
@@ -69,6 +69,8 @@ namespace OpenSim.Framework.Interfaces | |||
69 | 69 | ||
70 | public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client); | 70 | public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client); |
71 | 71 | ||
72 | public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client); | ||
73 | |||
72 | public interface IClientAPI | 74 | public interface IClientAPI |
73 | { | 75 | { |
74 | event ChatFromViewer OnChatFromViewer; | 76 | event ChatFromViewer OnChatFromViewer; |
@@ -103,6 +105,8 @@ namespace OpenSim.Framework.Interfaces | |||
103 | event NewAvatar OnNewAvatar; | 105 | event NewAvatar OnNewAvatar; |
104 | event GenericCall6 OnRemoveAvatar; | 106 | event GenericCall6 OnRemoveAvatar; |
105 | 107 | ||
108 | event UUIDNameRequest OnNameFromUUIDRequest; | ||
109 | |||
106 | event ParcelPropertiesRequest OnParcelPropertiesRequest; | 110 | event ParcelPropertiesRequest OnParcelPropertiesRequest; |
107 | event ParcelDivideRequest OnParcelDivideRequest; | 111 | event ParcelDivideRequest OnParcelDivideRequest; |
108 | event ParcelJoinRequest OnParcelJoinRequest; | 112 | event ParcelJoinRequest OnParcelJoinRequest; |
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj index 261b96b..fbbf568 100644 --- a/OpenSim/Framework/General/OpenSim.Framework.csproj +++ b/OpenSim/Framework/General/OpenSim.Framework.csproj | |||
@@ -133,10 +133,10 @@ | |||
133 | <Compile Include="Interfaces\IWorld.cs"> | 133 | <Compile Include="Interfaces\IWorld.cs"> |
134 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
135 | </Compile> | 135 | </Compile> |
136 | <Compile Include="Interfaces\IClientAPI.cs"> | 136 | <Compile Include="Interfaces\ILocalStorage.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | <Compile Include="Interfaces\ILocalStorage.cs"> | 139 | <Compile Include="Interfaces\IClientAPI.cs"> |
140 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
141 | </Compile> | 141 | </Compile> |
142 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> | 142 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> |
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build index f05217f..f81737d 100644 --- a/OpenSim/Framework/General/OpenSim.Framework.dll.build +++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build | |||
@@ -26,8 +26,8 @@ | |||
26 | <include name="Interfaces/IUserServer.cs" /> | 26 | <include name="Interfaces/IUserServer.cs" /> |
27 | <include name="Interfaces/IAssetServer.cs" /> | 27 | <include name="Interfaces/IAssetServer.cs" /> |
28 | <include name="Interfaces/IWorld.cs" /> | 28 | <include name="Interfaces/IWorld.cs" /> |
29 | <include name="Interfaces/IClientAPI.cs" /> | ||
30 | <include name="Interfaces/ILocalStorage.cs" /> | 29 | <include name="Interfaces/ILocalStorage.cs" /> |
30 | <include name="Interfaces/IClientAPI.cs" /> | ||
31 | <include name="Interfaces/Config/IGenericConfig.cs" /> | 31 | <include name="Interfaces/Config/IGenericConfig.cs" /> |
32 | <include name="Interfaces/Config/IUserConfig.cs" /> | 32 | <include name="Interfaces/Config/IUserConfig.cs" /> |
33 | <include name="Interfaces/Config/IGridConfig.cs" /> | 33 | <include name="Interfaces/Config/IGridConfig.cs" /> |