1 files changed, 78 insertions, 78 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs
index a1a6173..da1d3a7 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs
@@ -1,78 +1,78 @@
-/**
+/**
- * Copyright (c) 2008, Contributors. All rights reserved.
+ * Copyright (c) 2008, Contributors. All rights reserved.
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- * 
+ * 
- * Redistribution and use in source and binary forms, with or without modification, 
+ * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
+ * are permitted provided that the following conditions are met:
- * 
+ * 
- *     * Redistributions of source code must retain the above copyright notice, 
+ *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
+ *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
+ *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
+ *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
+ *       and/or other materials provided with the distribution.
- *     * Neither the name of the Organizations nor the names of Individual
+ *     * Neither the name of the Organizations nor the names of Individual
- *       Contributors may be used to endorse or promote products derived from 
+ *       Contributors may be used to endorse or promote products derived from 
- *       this software without specific prior written permission.
+ *       this software without specific prior written permission.
- * 
+ * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
- * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ * 
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using OpenMetaverse;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment;
+using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
+using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
-namespace OpenSim.Region.Environment.Scenes.Hypergrid
+namespace OpenSim.Region.Environment.Scenes.Hypergrid
-{
+{
-    public partial class HGScene : Scene
+    public partial class HGScene : Scene
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// Teleport an avatar to their home region
+        /// Teleport an avatar to their home region
-        /// </summary>
+        /// </summary>
-        /// <param name="agentId"></param>
+        /// <param name="agentId"></param>
-        /// <param name="client"></param>
+        /// <param name="client"></param>
-        public override void TeleportClientHome(UUID agentId, IClientAPI client)
+        public override void TeleportClientHome(UUID agentId, IClientAPI client)
-        {
+        {
-            m_log.Debug("[HGScene]: TeleportClientHome " + client.FirstName + " " + client.LastName);
+            m_log.Debug("[HGScene]: TeleportClientHome " + client.FirstName + " " + client.LastName);
-            CachedUserInfo uinfo = CommsManager.UserProfileCacheService.GetUserDetails(agentId);
+            CachedUserInfo uinfo = CommsManager.UserProfileCacheService.GetUserDetails(agentId);
-            UserProfileData UserProfile = uinfo.UserProfile;
+            UserProfileData UserProfile = uinfo.UserProfile;
-            if (UserProfile != null)
+            if (UserProfile != null)
-            {
+            {
-                RegionInfo regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion);
+                RegionInfo regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion);
-                    //if (regionInfo != null)
+                    //if (regionInfo != null)
-                    //{
+                    //{
-                    //    UserProfile.HomeRegionID = regionInfo.RegionID;
+                    //    UserProfile.HomeRegionID = regionInfo.RegionID;
-                    //    //CommsManager.UserService.UpdateUserProfile(UserProfile);
+                    //    //CommsManager.UserService.UpdateUserProfile(UserProfile);
-                    //}
+                    //}
-                if (regionInfo == null)
+                if (regionInfo == null)
-                {
+                {
-                    // can't find the Home region: Tell viewer and abort
+                    // can't find the Home region: Tell viewer and abort
-                    client.SendTeleportFailed("Your home-region could not be found.");
+                    client.SendTeleportFailed("Your home-region could not be found.");
-                    return;
+                    return;
-                }
+                }
-                RequestTeleportLocation(
+                RequestTeleportLocation(
-                    client, regionInfo.RegionHandle, UserProfile.HomeLocation, UserProfile.HomeLookAt,
+                    client, regionInfo.RegionHandle, UserProfile.HomeLocation, UserProfile.HomeLookAt,
-                    (uint)(TPFlags.SetLastToTarget | TPFlags.ViaHome));
+                    (uint)(TPFlags.SetLastToTarget | TPFlags.ViaHome));
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs index a1a6173..da1d3a7 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs +++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs
@@ -1,78 +1,78 @@
1	/**	1	/**
2	* Copyright (c) 2008, Contributors. All rights reserved.	2	* Copyright (c) 2008, Contributors. All rights reserved.
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without modification,	5	* Redistribution and use in source and binary forms, with or without modification,
6	* are permitted provided that the following conditions are met:	6	* are permitted provided that the following conditions are met:
7	*	7	*
8	* * Redistributions of source code must retain the above copyright notice,	8	* * Redistributions of source code must retain the above copyright notice,
9	* this list of conditions and the following disclaimer.	9	* this list of conditions and the following disclaimer.
10	* * Redistributions in binary form must reproduce the above copyright notice,	10	* * Redistributions in binary form must reproduce the above copyright notice,
11	* this list of conditions and the following disclaimer in the documentation	11	* this list of conditions and the following disclaimer in the documentation
12	* and/or other materials provided with the distribution.	12	* and/or other materials provided with the distribution.
13	* * Neither the name of the Organizations nor the names of Individual	13	* * Neither the name of the Organizations nor the names of Individual
14	* Contributors may be used to endorse or promote products derived from	14	* Contributors may be used to endorse or promote products derived from
15	* this software without specific prior written permission.	15	* this software without specific prior written permission.
16	*	16	*
17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND	17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL	19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
20	* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,	20	* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
21	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE	21	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
22	* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED	22	* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23	* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING	23	* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
24	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	24	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
25	* OF THE POSSIBILITY OF SUCH DAMAGE.	25	* OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28		28
29	using System;	29	using System;
30	using System.Collections.Generic;	30	using System.Collections.Generic;
31		31
32	using OpenMetaverse;	32	using OpenMetaverse;
33		33
34	using OpenSim.Framework;	34	using OpenSim.Framework;
35		35
36	using OpenSim.Framework.Communications.Cache;	36	using OpenSim.Framework.Communications.Cache;
37	using OpenSim.Region.Environment;	37	using OpenSim.Region.Environment;
38	using OpenSim.Region.Environment.Scenes;	38	using OpenSim.Region.Environment.Scenes;
39	using TPFlags = OpenSim.Framework.Constants.TeleportFlags;	39	using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
40		40
41	namespace OpenSim.Region.Environment.Scenes.Hypergrid	41	namespace OpenSim.Region.Environment.Scenes.Hypergrid
42	{	42	{
43	public partial class HGScene : Scene	43	public partial class HGScene : Scene
44	{	44	{
45	/// <summary>	45	/// <summary>
46	/// Teleport an avatar to their home region	46	/// Teleport an avatar to their home region
47	/// </summary>	47	/// </summary>
48	/// <param name="agentId"></param>	48	/// <param name="agentId"></param>
49	/// <param name="client"></param>	49	/// <param name="client"></param>
50	public override void TeleportClientHome(UUID agentId, IClientAPI client)	50	public override void TeleportClientHome(UUID agentId, IClientAPI client)
51	{	51	{
52	m_log.Debug("[HGScene]: TeleportClientHome " + client.FirstName + " " + client.LastName);	52	m_log.Debug("[HGScene]: TeleportClientHome " + client.FirstName + " " + client.LastName);
53		53
54	CachedUserInfo uinfo = CommsManager.UserProfileCacheService.GetUserDetails(agentId);	54	CachedUserInfo uinfo = CommsManager.UserProfileCacheService.GetUserDetails(agentId);
55	UserProfileData UserProfile = uinfo.UserProfile;	55	UserProfileData UserProfile = uinfo.UserProfile;
56		56
57	if (UserProfile != null)	57	if (UserProfile != null)
58	{	58	{
59	RegionInfo regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion);	59	RegionInfo regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion);
60	//if (regionInfo != null)	60	//if (regionInfo != null)
61	//{	61	//{
62	// UserProfile.HomeRegionID = regionInfo.RegionID;	62	// UserProfile.HomeRegionID = regionInfo.RegionID;
63	// //CommsManager.UserService.UpdateUserProfile(UserProfile);	63	// //CommsManager.UserService.UpdateUserProfile(UserProfile);
64	//}	64	//}
65	if (regionInfo == null)	65	if (regionInfo == null)
66	{	66	{
67	// can't find the Home region: Tell viewer and abort	67	// can't find the Home region: Tell viewer and abort
68	client.SendTeleportFailed("Your home-region could not be found.");	68	client.SendTeleportFailed("Your home-region could not be found.");
69	return;	69	return;
70	}	70	}
71	RequestTeleportLocation(	71	RequestTeleportLocation(
72	client, regionInfo.RegionHandle, UserProfile.HomeLocation, UserProfile.HomeLookAt,	72	client, regionInfo.RegionHandle, UserProfile.HomeLocation, UserProfile.HomeLookAt,
73	(uint)(TPFlags.SetLastToTarget \| TPFlags.ViaHome));	73	(uint)(TPFlags.SetLastToTarget \| TPFlags.ViaHome));
74	}	74	}
75	}	75	}
76		76
77	}	77	}
78	}	78	}