diff options
| author | Melanie | 2012-11-12 23:27:47 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-12 23:27:47 +0000 |
| commit | 2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc (patch) | |
| tree | 308caeac8741ef507a3f02f41d4403a29d06b06e /OpenSim/Region/CoreModules/Avatar/AvatarFactory | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Completely remove the IRegionModule interface (diff) | |
| download | opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.zip opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.gz opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.bz2 opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/ModuleLoader.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 5b04a39..7f083a9 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -62,7 +62,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 62 | 62 | ||
| 63 | private object m_setAppearanceLock = new object(); | 63 | private object m_setAppearanceLock = new object(); |
| 64 | 64 | ||
| 65 | #region IRegionModule | 65 | #region Region Module interface |
| 66 | 66 | ||
| 67 | public void Initialise(IConfigSource config) | 67 | public void Initialise(IConfigSource config) |
| 68 | { | 68 | { |