diff options
author | Justin Clark-Casey (justincc) | 2011-08-02 00:13:04 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-02 00:13:04 +0100 |
commit | b6ac1c46cd473b129b70344f0001f1e8f97d8860 (patch) | |
tree | 46e5d02205b63d16f29b3aaf6a3ad910192aaeb6 /OpenSim/Region/OptionalModules | |
parent | Get osNpcCreate appearance working with avatars that are currently in the scene. (diff) | |
download | opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.zip opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.gz opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.bz2 opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.xz |
Get rid of AvatarAppearance.Owner to simplify the code.
This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Framework/Monitoring/MonitorServicesModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Framework/Monitoring/MonitorServicesModule.cs b/OpenSim/Region/OptionalModules/Framework/Monitoring/MonitorServicesModule.cs index d49face..a25e034 100644 --- a/OpenSim/Region/OptionalModules/Framework/Monitoring/MonitorServicesModule.cs +++ b/OpenSim/Region/OptionalModules/Framework/Monitoring/MonitorServicesModule.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.OptionalModules.Framework.Monitoring | |||
47 | { | 47 | { |
48 | protected Scene m_scene; | 48 | protected Scene m_scene; |
49 | 49 | ||
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
51 | 51 | ||
52 | public string Name { get { return "Services Health Monitoring Module"; } } | 52 | public string Name { get { return "Services Health Monitoring Module"; } } |
53 | 53 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 64f82c9..6286dc8 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -93,7 +93,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
93 | 93 | ||
94 | AvatarAppearance originalAppearance = GetAppearance(cloneAppearanceFrom, scene); | 94 | AvatarAppearance originalAppearance = GetAppearance(cloneAppearanceFrom, scene); |
95 | AvatarAppearance npcAppearance = new AvatarAppearance(originalAppearance, true); | 95 | AvatarAppearance npcAppearance = new AvatarAppearance(originalAppearance, true); |
96 | npcAppearance.Owner = acd.AgentID; | ||
97 | acd.Appearance = npcAppearance; | 96 | acd.Appearance = npcAppearance; |
98 | 97 | ||
99 | // for (int i = 0; i < acd.Appearance.Texture.FaceTextures.Length; i++) | 98 | // for (int i = 0; i < acd.Appearance.Texture.FaceTextures.Length; i++) |