diff options
| author | Melanie | 2011-12-10 00:40:41 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-10 00:40:41 +0000 |
| commit | 3f421837979a1d3d830274c967abc7258cb50687 (patch) | |
| tree | 3ae57deca915d7dc89586d103d48c6f6f6fd1d6d /OpenSim/Region/OptionalModules/Avatar | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: remove a mono compiler warning (diff) | |
| download | opensim-SC_OLD-3f421837979a1d3d830274c967abc7258cb50687.zip opensim-SC_OLD-3f421837979a1d3d830274c967abc7258cb50687.tar.gz opensim-SC_OLD-3f421837979a1d3d830274c967abc7258cb50687.tar.bz2 opensim-SC_OLD-3f421837979a1d3d830274c967abc7258cb50687.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs index 89704d5..40cbc60 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs | |||
| @@ -53,7 +53,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance | |||
| 53 | public const string SHOW_APPEARANCE_FORMAT = "{0,-9} {1}"; | 53 | public const string SHOW_APPEARANCE_FORMAT = "{0,-9} {1}"; |
| 54 | 54 | ||
| 55 | private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); | 55 | private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); |
| 56 | private IAvatarFactoryModule m_avatarFactory; | 56 | // private IAvatarFactoryModule m_avatarFactory; |
| 57 | 57 | ||
| 58 | public string Name { get { return "Appearance Information Module"; } } | 58 | public string Name { get { return "Appearance Information Module"; } } |
| 59 | 59 | ||