aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2007-06-28 19:09:50 +0000
committermingchen2007-06-28 19:09:50 +0000
commitfe0528b98cfc13d26ac7f1bf6bc23655be1f52e5 (patch)
tree3ec7a1b247e84add390e962a58d26ec43c29e240
parentenabled physics plugin flying flags. (diff)
downloadopensim-SC_OLD-fe0528b98cfc13d26ac7f1bf6bc23655be1f52e5.zip
opensim-SC_OLD-fe0528b98cfc13d26ac7f1bf6bc23655be1f52e5.tar.gz
opensim-SC_OLD-fe0528b98cfc13d26ac7f1bf6bc23655be1f52e5.tar.bz2
opensim-SC_OLD-fe0528b98cfc13d26ac7f1bf6bc23655be1f52e5.tar.xz
*Added UUIDNameRequest packet support (untested, but should work -- at least in sandbox mode)
*Various small renamings
Diffstat
-rw-r--r--OpenGridServices.sln127
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs18
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs4
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.csproj4
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.dll.build2
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs8
-rw-r--r--OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj6
-rw-r--r--OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs3
-rw-r--r--OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs8
-rw-r--r--OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj10
-rw-r--r--OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build6
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs (renamed from OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs)0
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs (renamed from OpenSim/Region/Communications/OGS1/OGSUserServices.cs)10
-rw-r--r--OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj51
-rw-r--r--OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build6
-rw-r--r--OpenSim/Region/Environment/OpenSim.Region.Environment.csproj6
-rw-r--r--OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs3
21 files changed, 158 insertions, 122 deletions
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 5f47b6b..2343bc0 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual C# Express 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}" 5Project("{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
25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}" 25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
26EndProject 26EndProject
27Global 27Global
28 GlobalSection(SolutionConfigurationPlatforms) = preSolution 28 GlobalSection(SolutionConfigurationPlatforms) = preSolution
29 Debug|Any CPU = Debug|Any CPU 29 Debug|Any CPU = Debug|Any CPU
30 Release|Any CPU = Release|Any CPU 30 Release|Any CPU = Release|Any CPU
31 EndGlobalSection 31 EndGlobalSection
32 GlobalSection(ProjectConfigurationPlatforms) = postSolution 32 GlobalSection(ProjectDependencies) = postSolution
33 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 33 ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
34 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 34 ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
35 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 35 ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
36 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 36 ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
37 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 37 ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
38 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 38 ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
39 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 39 ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
40 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 40 ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
41 {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 41 ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
42 {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 42 EndGlobalSection
43 {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 43 GlobalSection(ProjectConfigurationPlatforms) = postSolution
44 {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 44 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45 {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 45 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
46 {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 46 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
47 {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 47 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
48 {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 48 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49 {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 49 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
50 {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 50 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
51 {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 51 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
52 {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 52 {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53 {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 53 {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
54 {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 54 {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
55 {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 55 {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
56 {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 56 {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57 {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 57 {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
58 {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 58 {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
59 {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 59 {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
60 {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 60 {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61 {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 61 {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
62 {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 62 {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
63 {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 63 {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
64 {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 64 {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65 {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 65 {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
66 {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 66 {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
67 {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 67 {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
68 {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 68 {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
69 {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 69 {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
70 {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 70 {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
71 {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 71 {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
72 {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 72 {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
73 {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 73 {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
74 {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 74 {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
75 {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 75 {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
76 {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 76 {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
77 {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 77 {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
78 {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 78 {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
79 {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 79 {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
80 {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 80 {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
81 EndGlobalSection 81 {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
82 GlobalSection(SolutionProperties) = preSolution 82 {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
83 HideSolutionNode = FALSE 83 {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
84 EndGlobalSection 84 {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85 {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
86 {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
87 {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
88 {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
89 {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
90 {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
91 {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
92 EndGlobalSection
93 GlobalSection(SolutionProperties) = preSolution
94 HideSolutionNode = FALSE
95 EndGlobalSection
85EndGlobal 96EndGlobal
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;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Data;
33using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
35using libsecondlife; 36using libsecondlife;
37using libsecondlife.Packets;
36 38
37namespace OpenSim.Framework.Communications 39namespace 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" />
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index a5150e6..fcb2493 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -64,8 +64,8 @@ namespace OpenSim
64 64
65 public class OpenSimMain : RegionApplicationBase, conscmd_callback 65 public class OpenSimMain : RegionApplicationBase, conscmd_callback
66 { 66 {
67 // private CheckSumServer checkServer;
68 protected CommunicationsManager commsManager; 67 protected CommunicationsManager commsManager;
68 // private CheckSumServer checkServer;
69 69
70 private bool m_silent; 70 private bool m_silent;
71 private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log"; 71 private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";
@@ -106,14 +106,12 @@ namespace OpenSim
106 106
107 ClientView.TerrainManager = new TerrainManager(new SecondLife()); 107 ClientView.TerrainManager = new TerrainManager(new SecondLife());
108 108
109 CommunicationsLocal sandboxCommunications = null;
110 if (m_sandbox) 109 if (m_sandbox)
111 { 110 {
112 this.SetupLocalGridServers(); 111 this.SetupLocalGridServers();
113 // this.checkServer = new CheckSumServer(12036); 112 // this.checkServer = new CheckSumServer(12036);
114 // this.checkServer.ServerListener(); 113 // this.checkServer.ServerListener();
115 sandboxCommunications = new CommunicationsLocal(this.serversData); 114 this.commsManager = new CommunicationsLocal(this.serversData);
116 this.commsManager = sandboxCommunications;
117 } 115 }
118 else 116 else
119 { 117 {
@@ -136,7 +134,7 @@ namespace OpenSim
136 134
137 if (m_sandbox) 135 if (m_sandbox)
138 { 136 {
139 httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod); 137 httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
140 } 138 }
141 139
142 //Start http server 140 //Start http server
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 1ed28d2..bb21365 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -114,9 +114,6 @@
114 <Compile Include="LLSDType.cs"> 114 <Compile Include="LLSDType.cs">
115 <SubType>Code</SubType> 115 <SubType>Code</SubType>
116 </Compile> 116 </Compile>
117 <Compile Include="LLSDHelpers.cs">
118 <SubType>Code</SubType>
119 </Compile>
120 <Compile Include="LLSDCapEvent.cs"> 117 <Compile Include="LLSDCapEvent.cs">
121 <SubType>Code</SubType> 118 <SubType>Code</SubType>
122 </Compile> 119 </Compile>
@@ -132,6 +129,9 @@
132 <Compile Include="LLSDMapLayer.cs"> 129 <Compile Include="LLSDMapLayer.cs">
133 <SubType>Code</SubType> 130 <SubType>Code</SubType>
134 </Compile> 131 </Compile>
132 <Compile Include="LLSDHelpers.cs">
133 <SubType>Code</SubType>
134 </Compile>
135 </ItemGroup> 135 </ItemGroup>
136 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 136 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
137 <PropertyGroup> 137 <PropertyGroup>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index dd853e7..817e5b0 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -17,12 +17,12 @@
17 <include name="LLSDTest.cs" /> 17 <include name="LLSDTest.cs" />
18 <include name="LLSDUploadReply.cs" /> 18 <include name="LLSDUploadReply.cs" />
19 <include name="LLSDType.cs" /> 19 <include name="LLSDType.cs" />
20 <include name="LLSDHelpers.cs" />
21 <include name="LLSDCapEvent.cs" /> 20 <include name="LLSDCapEvent.cs" />
22 <include name="LLSDMapRequest.cs" /> 21 <include name="LLSDMapRequest.cs" />
23 <include name="Caps.cs" /> 22 <include name="Caps.cs" />
24 <include name="LLSDMapLayerResponse.cs" /> 23 <include name="LLSDMapLayerResponse.cs" />
25 <include name="LLSDMapLayer.cs" /> 24 <include name="LLSDMapLayer.cs" />
25 <include name="LLSDHelpers.cs" />
26 </sources> 26 </sources>
27 <references basedir="${project::get-base-directory()}"> 27 <references basedir="${project::get-base-directory()}">
28 <lib> 28 <lib>
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 5e346fb..9650b42 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -68,6 +68,8 @@ namespace OpenSim.Region.ClientStack
68 public event GenericCall6 OnRemoveAvatar; 68 public event GenericCall6 OnRemoveAvatar;
69 public event RequestMapBlocks OnRequestMapBlocks; 69 public event RequestMapBlocks OnRequestMapBlocks;
70 public event TeleportLocationRequest OnTeleportLocationRequest; 70 public event TeleportLocationRequest OnTeleportLocationRequest;
71
72 public event UUIDNameRequest OnNameFromUUIDRequest;
71 73
72 public event ParcelPropertiesRequest OnParcelPropertiesRequest; 74 public event ParcelPropertiesRequest OnParcelPropertiesRequest;
73 public event ParcelDivideRequest OnParcelDivideRequest; 75 public event ParcelDivideRequest OnParcelDivideRequest;
@@ -75,7 +77,6 @@ namespace OpenSim.Region.ClientStack
75 public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; 77 public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
76 78
77 public event EstateOwnerMessageRequest OnEstateOwnerMessage; 79 public event EstateOwnerMessageRequest OnEstateOwnerMessage;
78
79 /// <summary> 80 /// <summary>
80 /// 81 ///
81 /// </summary> 82 /// </summary>
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index cbd10dc..0456e3c 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -192,7 +192,5 @@ namespace OpenSim.Region.ClientStack
192 this.OutPacket(mbReply); 192 this.OutPacket(mbReply);
193 */ 193 */
194 } 194 }
195
196
197 } 195 }
198} 196}
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 51981b8..794ce79 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -492,7 +492,13 @@ namespace OpenSim.Region.ClientStack
492 case PacketType.MoneyBalanceRequest: 492 case PacketType.MoneyBalanceRequest:
493 this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000); 493 this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
494 break; 494 break;
495 495 case PacketType.UUIDNameRequest:
496 UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
497 foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
498 {
499 OnNameFromUUIDRequest(UUIDBlock.ID, this);
500 }
501 break;
496 #region Parcel related packets 502 #region Parcel related packets
497 case PacketType.ParcelPropertiesRequest: 503 case PacketType.ParcelPropertiesRequest:
498 ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack; 504 ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 2e1d8e2..e679174 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -134,22 +134,22 @@
134 <Compile Include="UDPServer.cs"> 134 <Compile Include="UDPServer.cs">
135 <SubType>Code</SubType> 135 <SubType>Code</SubType>
136 </Compile> 136 </Compile>
137 <Compile Include="ClientView.PacketHandlers.cs"> 137 <Compile Include="ClientViewBase.cs">
138 <SubType>Code</SubType> 138 <SubType>Code</SubType>
139 </Compile> 139 </Compile>
140 <Compile Include="ClientView.API.cs"> 140 <Compile Include="ClientView.cs">
141 <SubType>Code</SubType> 141 <SubType>Code</SubType>
142 </Compile> 142 </Compile>
143 <Compile Include="ClientView.ProcessPackets.cs"> 143 <Compile Include="ClientView.PacketHandlers.cs">
144 <SubType>Code</SubType> 144 <SubType>Code</SubType>
145 </Compile> 145 </Compile>
146 <Compile Include="RegionApplicationBase.cs"> 146 <Compile Include="RegionApplicationBase.cs">
147 <SubType>Code</SubType> 147 <SubType>Code</SubType>
148 </Compile> 148 </Compile>
149 <Compile Include="ClientViewBase.cs"> 149 <Compile Include="ClientView.API.cs">
150 <SubType>Code</SubType> 150 <SubType>Code</SubType>
151 </Compile> 151 </Compile>
152 <Compile Include="ClientView.cs"> 152 <Compile Include="ClientView.ProcessPackets.cs">
153 <SubType>Code</SubType> 153 <SubType>Code</SubType>
154 </Compile> 154 </Compile>
155 <Compile Include="Assets\InventoryCache.cs"> 155 <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 1c791d3..95422c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -15,12 +15,12 @@
15 <include name="ClientStackNetworkHandler.cs" /> 15 <include name="ClientStackNetworkHandler.cs" />
16 <include name="PacketServer.cs" /> 16 <include name="PacketServer.cs" />
17 <include name="UDPServer.cs" /> 17 <include name="UDPServer.cs" />
18 <include name="ClientViewBase.cs" />
19 <include name="ClientView.cs" />
18 <include name="ClientView.PacketHandlers.cs" /> 20 <include name="ClientView.PacketHandlers.cs" />
21 <include name="RegionApplicationBase.cs" />
19 <include name="ClientView.API.cs" /> 22 <include name="ClientView.API.cs" />
20 <include name="ClientView.ProcessPackets.cs" /> 23 <include name="ClientView.ProcessPackets.cs" />
21 <include name="RegionApplicationBase.cs" />
22 <include name="ClientViewBase.cs" />
23 <include name="ClientView.cs" />
24 <include name="Assets/InventoryCache.cs" /> 24 <include name="Assets/InventoryCache.cs" />
25 </sources> 25 </sources>
26 <references basedir="${project::get-base-directory()}"> 26 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index f2b3b92..870f577 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -12,7 +12,7 @@ namespace OpenSim.Region.Communications.OGS1
12 { 12 {
13 GridServer = gridInterComms; 13 GridServer = gridInterComms;
14 InterRegion = gridInterComms; 14 InterRegion = gridInterComms;
15 UserServer = new OGSUserServices(this); 15 UserServer = new OGS1UserServices(this);
16 } 16 }
17 } 17 }
18} 18}
diff --git a/OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 51b33e9..51b33e9 100644
--- a/OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 56a7837..856c447 100644
--- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -11,16 +11,22 @@ using Nwc.XmlRpc;
11 11
12namespace OpenSim.Region.Communications.OGS1 12namespace OpenSim.Region.Communications.OGS1
13{ 13{
14 public class OGSUserServices :IUserServices 14 public class OGS1UserServices :IUserServices
15 { 15 {
16 CommunicationsOGS1 m_parent; 16 CommunicationsOGS1 m_parent;
17 public OGSUserServices(CommunicationsOGS1 parent) 17 public OGS1UserServices(CommunicationsOGS1 parent)
18 { 18 {
19 m_parent = parent; 19 m_parent = parent;
20 } 20 }
21 21
22 public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data) 22 public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
23 { 23 {
24 if (data.Contains("error_type"))
25 {
26 Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] + "): " + data["error_desc"]);
27 return null;
28 }
29
24 UserProfileData userData = new UserProfileData(); 30 UserProfileData userData = new UserProfileData();
25 userData.username = (string)data["firstname"]; 31 userData.username = (string)data["firstname"];
26 userData.surname = (string)data["lastname"]; 32 userData.surname = (string)data["lastname"];
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index b03ac7e..0a9e5fb 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.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,8 +6,7 @@
6 <ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{4806E378-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>OpenSim.Region.Communications.OGS1</AssemblyName> 12 <AssemblyName>OpenSim.Region.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>OpenSim.Region.Communications.OGS1</RootNamespace> 19 <RootNamespace>OpenSim.Region.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,31 +55,30 @@
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.Runtime.Remoting"> 73 <Reference Include="System.Runtime.Remoting" >
81 <HintPath>System.Runtime.Remoting.dll</HintPath> 74 <HintPath>System.Runtime.Remoting.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
84 <Reference Include="System.Xml"> 77 <Reference Include="System.Xml" >
85 <HintPath>System.Xml.dll</HintPath> 78 <HintPath>System.Xml.dll</HintPath>
86 <Private>False</Private> 79 <Private>False</Private>
87 </Reference> 80 </Reference>
88 <Reference Include="XMLRPC.dll"> 81 <Reference Include="XMLRPC.dll" >
89 <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath> 82 <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
90 <Private>False</Private> 83 <Private>False</Private>
91 </Reference> 84 </Reference>
@@ -95,35 +88,35 @@
95 <Name>OpenSim.Framework</Name> 88 <Name>OpenSim.Framework</Name>
96 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 89 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
97 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
98 <Private>False</Private> 91 <Private>False</Private>
99 </ProjectReference> 92 </ProjectReference>
100 <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> 93 <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
101 <Name>OpenSim.Framework.Communications</Name> 94 <Name>OpenSim.Framework.Communications</Name>
102 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> 95 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
103 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
104 <Private>False</Private> 97 <Private>False</Private>
105 </ProjectReference> 98 </ProjectReference>
106 <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> 99 <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
107 <Name>OpenSim.Framework.Console</Name> 100 <Name>OpenSim.Framework.Console</Name>
108 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 101 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
109 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
110 <Private>False</Private> 103 <Private>False</Private>
111 </ProjectReference> 104 </ProjectReference>
112 <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj"> 105 <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
113 <Name>OpenSim.Framework.Data</Name> 106 <Name>OpenSim.Framework.Data</Name>
114 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project> 107 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
115 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
116 <Private>False</Private> 109 <Private>False</Private>
117 </ProjectReference> 110 </ProjectReference>
118 <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> 111 <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
119 <Name>OpenSim.Framework.Servers</Name> 112 <Name>OpenSim.Framework.Servers</Name>
120 <Project>{2CC71860-0000-0000-0000-000000000000}</Project> 113 <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
121 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
122 <Private>False</Private> 115 <Private>False</Private>
123 </ProjectReference> 116 </ProjectReference>
124 </ItemGroup> 117 </ItemGroup>
125 <ItemGroup> 118 <ItemGroup>
126 <Compile Include="OGSInterSimComms.cs"> 119 <Compile Include="OGS1InterSimComms.cs">
127 <SubType>Code</SubType> 120 <SubType>Code</SubType>
128 </Compile> 121 </Compile>
129 <Compile Include="OGS1GridServices.cs"> 122 <Compile Include="OGS1GridServices.cs">
@@ -132,7 +125,7 @@
132 <Compile Include="CommunicationsOGS1.cs"> 125 <Compile Include="CommunicationsOGS1.cs">
133 <SubType>Code</SubType> 126 <SubType>Code</SubType>
134 </Compile> 127 </Compile>
135 <Compile Include="OGSUserServices.cs"> 128 <Compile Include="OGS1UserServices.cs">
136 <SubType>Code</SubType> 129 <SubType>Code</SubType>
137 </Compile> 130 </Compile>
138 <Compile Include="Properties\AssemblyInfo.cs"> 131 <Compile Include="Properties\AssemblyInfo.cs">
@@ -146,4 +139,4 @@
146 <PostBuildEvent> 139 <PostBuildEvent>
147 </PostBuildEvent> 140 </PostBuildEvent>
148 </PropertyGroup> 141 </PropertyGroup>
149</Project> \ No newline at end of file 142</Project>
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 1a7cf69..2176b14 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,10 +11,10 @@
11 <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > 11 <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="OGSInterSimComms.cs" /> 14 <include name="OGS1InterSimComms.cs" />
15 <include name="OGS1GridServices.cs" /> 15 <include name="OGS1GridServices.cs" />
16 <include name="GridCommsManager.cs" /> 16 <include name="CommunicationsOGS1.cs" />
17 <include name="OGSUserServices.cs" /> 17 <include name="OGS1UserServices.cs" />
18 <include name="Properties/AssemblyInfo.cs" /> 18 <include name="Properties/AssemblyInfo.cs" />
19 </sources> 19 </sources>
20 <references basedir="${project::get-base-directory()}"> 20 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 9f8d2c3..0cfeda9 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -163,9 +163,6 @@
163 <Compile Include="Scenes\SceneEvents.cs"> 163 <Compile Include="Scenes\SceneEvents.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="Scenes\ScenePresence.cs">
167 <SubType>Code</SubType>
168 </Compile>
169 <Compile Include="Scenes\ScenePresence.Animations.cs"> 166 <Compile Include="Scenes\ScenePresence.Animations.cs">
170 <SubType>Code</SubType> 167 <SubType>Code</SubType>
171 </Compile> 168 </Compile>
@@ -187,6 +184,9 @@
187 <Compile Include="Scenes\SceneBase.cs"> 184 <Compile Include="Scenes\SceneBase.cs">
188 <SubType>Code</SubType> 185 <SubType>Code</SubType>
189 </Compile> 186 </Compile>
187 <Compile Include="Scenes\ScenePresence.cs">
188 <SubType>Code</SubType>
189 </Compile>
190 <Compile Include="Scenes\Scene.cs"> 190 <Compile Include="Scenes\Scene.cs">
191 <SubType>Code</SubType> 191 <SubType>Code</SubType>
192 </Compile> 192 </Compile>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 667f1d7..fcfc623 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -16,7 +16,6 @@
16 <include name="ParcelManager.cs" /> 16 <include name="ParcelManager.cs" />
17 <include name="Scenes/ScenePresence.Body.cs" /> 17 <include name="Scenes/ScenePresence.Body.cs" />
18 <include name="Scenes/SceneEvents.cs" /> 18 <include name="Scenes/SceneEvents.cs" />
19 <include name="Scenes/ScenePresence.cs" />
20 <include name="Scenes/ScenePresence.Animations.cs" /> 19 <include name="Scenes/ScenePresence.Animations.cs" />
21 <include name="Scenes/Scene.PacketHandlers.cs" /> 20 <include name="Scenes/Scene.PacketHandlers.cs" />
22 <include name="Scenes/SceneObject.cs" /> 21 <include name="Scenes/SceneObject.cs" />
@@ -24,6 +23,7 @@
24 <include name="Scenes/IScenePresenceBody.cs" /> 23 <include name="Scenes/IScenePresenceBody.cs" />
25 <include name="Scenes/Entity.cs" /> 24 <include name="Scenes/Entity.cs" />
26 <include name="Scenes/SceneBase.cs" /> 25 <include name="Scenes/SceneBase.cs" />
26 <include name="Scenes/ScenePresence.cs" />
27 <include name="Scenes/Scene.cs" /> 27 <include name="Scenes/Scene.cs" />
28 <include name="Scenes/scripting/ScriptManager.cs" /> 28 <include name="Scenes/scripting/ScriptManager.cs" />
29 <include name="Scenes/scripting/ScriptInfo.cs" /> 29 <include name="Scenes/scripting/ScriptInfo.cs" />
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f1de803..8c912d0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -505,6 +505,7 @@ namespace OpenSim.Region.Environment.Scenes
505 remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation; 505 remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
506 //remoteClient.OnObjectSelect += this.SelectPrim; 506 //remoteClient.OnObjectSelect += this.SelectPrim;
507 remoteClient.OnGrapUpdate += this.MoveObject; 507 remoteClient.OnGrapUpdate += this.MoveObject;
508 remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
508 509
509 /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); 510 /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
510 remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); 511 remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
@@ -512,7 +513,7 @@ namespace OpenSim.Region.Environment.Scenes
512 remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); 513 remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
513 remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); 514 remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
514 */ 515 */
515 516
516 ScenePresence newAvatar = null; 517 ScenePresence newAvatar = null;
517 try 518 try
518 { 519 {
generated by cgit v1.1 at 2024-07-02 21:26:51 +0000