aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-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
3 files changed, 6 insertions, 5 deletions
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 {