Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge

author: Melanie 2011-10-25 03:16:47 +0100
committer: Melanie 2011-10-25 03:16:47 +0100
commit: 04678836c32d8d639503fb762b46ff499366bd8c (patch)
tree: e6163a94be920589a7f89f96b8491b6b64c25938 /OpenSim/Region/ScriptEngine/Shared/Api
parent: Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge (diff)
parent: Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... (diff)
download: opensim-SC_OLD-04678836c32d8d639503fb762b46ff499366bd8c.zip
opensim-SC_OLD-04678836c32d8d639503fb762b46ff499366bd8c.tar.gz
opensim-SC_OLD-04678836c32d8d639503fb762b46ff499366bd8c.tar.bz2
opensim-SC_OLD-04678836c32d8d639503fb762b46ff499366bd8c.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index bcbb8ef..ed2f221 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2413,7 +2413,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        protected LSL_Key SaveAppearanceToNotecard(ScenePresence sp, string notecard)
        {
-            IAvatarFactory appearanceModule = World.RequestModuleInterface<IAvatarFactory>();
+            IAvatarFactoryModule appearanceModule = World.RequestModuleInterface<IAvatarFactoryModule>();
            if (appearanceModule != null)
            {
author	Melanie	2011-10-25 03:16:47 +0100
committer	Melanie	2011-10-25 03:16:47 +0100
commit	04678836c32d8d639503fb762b46ff499366bd8c (patch)
tree	e6163a94be920589a7f89f96b8491b6b64c25938 /OpenSim/Region/ScriptEngine/Shared/Api
parent	Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge (diff)
parent	Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... (diff)
download	opensim-SC_OLD-04678836c32d8d639503fb762b46ff499366bd8c.zip opensim-SC_OLD-04678836c32d8d639503fb762b46ff499366bd8c.tar.gz opensim-SC_OLD-04678836c32d8d639503fb762b46ff499366bd8c.tar.bz2 opensim-SC_OLD-04678836c32d8d639503fb762b46ff499366bd8c.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index bcbb8ef..ed2f221 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2413,7 +2413,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2413		2413
2414	protected LSL_Key SaveAppearanceToNotecard(ScenePresence sp, string notecard)	2414	protected LSL_Key SaveAppearanceToNotecard(ScenePresence sp, string notecard)
2415	{	2415	{
2416	IAvatarFactory appearanceModule = World.RequestModuleInterface<IAvatarFactory>();	2416	IAvatarFactoryModule appearanceModule = World.RequestModuleInterface<IAvatarFactoryModule>();
2417		2417
2418	if (appearanceModule != null)	2418	if (appearanceModule != null)
2419	{	2419	{