diff options
author | Melanie Thielker | 2008-08-16 02:00:36 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-16 02:00:36 +0000 |
commit | 328ab79b783d4beaa5f954918e3b306950153c1a (patch) | |
tree | e2bf03b6cc7c6514a9c83968a716648394602e14 /OpenSim/Region/ScriptEngine | |
parent | Perils of copypaste. Missing references. (diff) | |
download | opensim-SC_OLD-328ab79b783d4beaa5f954918e3b306950153c1a.zip opensim-SC_OLD-328ab79b783d4beaa5f954918e3b306950153c1a.tar.gz opensim-SC_OLD-328ab79b783d4beaa5f954918e3b306950153c1a.tar.bz2 opensim-SC_OLD-328ab79b783d4beaa5f954918e3b306950153c1a.tar.xz |
Refactor a lot of direct calls to OGS1 to use the cached version instead.
Scripts can now no longer DOS the user server and there are a lot fewer
gratuitious lookups of user profile data.
Diffstat (limited to '')
4 files changed, 14 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 32e9085..d7cd027 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -645,10 +645,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
645 | public string resolveName(LLUUID objecUUID) | 645 | public string resolveName(LLUUID objecUUID) |
646 | { | 646 | { |
647 | // try avatar username surname | 647 | // try avatar username surname |
648 | UserProfileData profile = World.CommsManager.UserService.GetUserProfile(objecUUID); | 648 | CachedUserInfo profile = World.CommsManager.UserProfileCacheService.GetUserDetails(objecUUID); |
649 | if (profile != null) | 649 | if (profile != null && profile.UserProfile != null) |
650 | { | 650 | { |
651 | string avatarname = profile.FirstName + " " + profile.SurName; | 651 | string avatarname = profile.UserProfile.FirstName + " " + profile.UserProfile.SurName; |
652 | return avatarname; | 652 | return avatarname; |
653 | } | 653 | } |
654 | // try an scene object | 654 | // try an scene object |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs index aaea2ee..9b636fd 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs | |||
@@ -30,6 +30,7 @@ using System.Collections.Generic; | |||
30 | using libsecondlife; | 30 | using libsecondlife; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Environment.Scenes; | 32 | using OpenSim.Region.Environment.Scenes; |
33 | using OpenSim.Framework.Communications.Cache; | ||
33 | 34 | ||
34 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins | 35 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins |
35 | { | 36 | { |
@@ -272,10 +273,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
272 | string entname =ent.Name; | 273 | string entname =ent.Name; |
273 | 274 | ||
274 | // try avatar username surname | 275 | // try avatar username surname |
275 | UserProfileData profile = m_CmdManager.m_ScriptEngine.World.CommsManager.UserService.GetUserProfile(ent.UUID); | 276 | CachedUserInfo profile = m_CmdManager.m_ScriptEngine.World.CommsManager.UserProfileCacheService.GetUserDetails(ent.UUID); |
276 | if (profile != null) | 277 | if (profile != null && profile.UserProfile != null) |
277 | { | 278 | { |
278 | avatarname = profile.FirstName + " " + profile.SurName; | 279 | avatarname = profile.UserProfile.FirstName + " " + profile.UserProfile.SurName; |
279 | } | 280 | } |
280 | // try an scene object | 281 | // try an scene object |
281 | SceneObjectPart SOP = m_CmdManager.m_ScriptEngine.World.GetSceneObjectPart(ent.UUID); | 282 | SceneObjectPart SOP = m_CmdManager.m_ScriptEngine.World.GetSceneObjectPart(ent.UUID); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 15793e4..5ab6c4d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -633,10 +633,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
633 | public string resolveName(LLUUID objecUUID) | 633 | public string resolveName(LLUUID objecUUID) |
634 | { | 634 | { |
635 | // try avatar username surname | 635 | // try avatar username surname |
636 | UserProfileData profile = World.CommsManager.UserService.GetUserProfile(objecUUID); | 636 | CachedUserInfo profile = World.CommsManager.UserProfileCacheService.GetUserDetails(objecUUID); |
637 | if (profile != null) | 637 | if (profile != null && profile.UserProfile != null) |
638 | { | 638 | { |
639 | string avatarname = profile.FirstName + " " + profile.SurName; | 639 | string avatarname = profile.UserProfile.FirstName + " " + profile.UserProfile.SurName; |
640 | return avatarname; | 640 | return avatarname; |
641 | } | 641 | } |
642 | // try an scene object | 642 | // try an scene object |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 5833512..eaf4bd0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -29,6 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using libsecondlife; | 30 | using libsecondlife; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Communications.Cache; | ||
32 | using OpenSim.Region.Environment.Scenes; | 33 | using OpenSim.Region.Environment.Scenes; |
33 | using OpenSim.Region.ScriptEngine.Shared; | 34 | using OpenSim.Region.ScriptEngine.Shared; |
34 | using OpenSim.Region.ScriptEngine.Shared.Api; | 35 | using OpenSim.Region.ScriptEngine.Shared.Api; |
@@ -263,10 +264,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
263 | string entname =ent.Name; | 264 | string entname =ent.Name; |
264 | 265 | ||
265 | // try avatar username surname | 266 | // try avatar username surname |
266 | UserProfileData profile = m_CmdManager.m_ScriptEngine.World.CommsManager.UserService.GetUserProfile(ent.UUID); | 267 | CachedUserInfo profile = m_CmdManager.m_ScriptEngine.World.CommsManager.UserProfileCacheService.GetUserDetails(ent.UUID); |
267 | if (profile != null) | 268 | if (profile != null && profile.UserProfile != null) |
268 | { | 269 | { |
269 | avatarname = profile.FirstName + " " + profile.SurName; | 270 | avatarname = profile.UserProfile.FirstName + " " + profile.UserProfile.SurName; |
270 | } | 271 | } |
271 | // try an scene object | 272 | // try an scene object |
272 | SceneObjectPart SOP = m_CmdManager.m_ScriptEngine.World.GetSceneObjectPart(ent.UUID); | 273 | SceneObjectPart SOP = m_CmdManager.m_ScriptEngine.World.GetSceneObjectPart(ent.UUID); |