diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Helpers.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index e44a106..d30a1c4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |||
@@ -121,7 +121,6 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
121 | Type = 0; | 121 | Type = 0; |
122 | Velocity = new LSL_Types.Vector3(); | 122 | Velocity = new LSL_Types.Vector3(); |
123 | initializeSurfaceTouch(); | 123 | initializeSurfaceTouch(); |
124 | Country = String.Empty; | ||
125 | } | 124 | } |
126 | 125 | ||
127 | public UUID Key; | 126 | public UUID Key; |
@@ -153,8 +152,6 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
153 | private int touchFace; | 152 | private int touchFace; |
154 | public int TouchFace { get { return touchFace; } } | 153 | public int TouchFace { get { return touchFace; } } |
155 | 154 | ||
156 | public string Country; | ||
157 | |||
158 | // This can be done in two places including the constructor | 155 | // This can be done in two places including the constructor |
159 | // so be carefull what gets added here | 156 | // so be carefull what gets added here |
160 | private void initializeSurfaceTouch() | 157 | private void initializeSurfaceTouch() |
@@ -202,9 +199,6 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
202 | return; | 199 | return; |
203 | 200 | ||
204 | Name = presence.Firstname + " " + presence.Lastname; | 201 | Name = presence.Firstname + " " + presence.Lastname; |
205 | UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, Key); | ||
206 | if (account != null) | ||
207 | Country = account.UserCountry; | ||
208 | 202 | ||
209 | Owner = Key; | 203 | Owner = Key; |
210 | Position = new LSL_Types.Vector3(presence.AbsolutePosition); | 204 | Position = new LSL_Types.Vector3(presence.AbsolutePosition); |