diff options
Renamed Avatar to ScenePresence to avoid clash with libsl Avatar class.
Added ThirdPartyLicenses folder containing the licenses for the various third party libraries we use.
Plus some other small changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs (renamed from OpenSim/OpenSim.Region/Scenes/Avatar.Animations.cs) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.Animations.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs index cc0fb7a..f0a8721 100644 --- a/OpenSim/OpenSim.Region/Scenes/Avatar.Animations.cs +++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.Animations.cs | |||
@@ -33,7 +33,7 @@ using System.Xml; | |||
33 | 33 | ||
34 | namespace OpenSim.Region.Scenes | 34 | namespace OpenSim.Region.Scenes |
35 | { | 35 | { |
36 | partial class Avatar | 36 | partial class ScenePresence |
37 | { | 37 | { |
38 | public class AvatarAnimations | 38 | public class AvatarAnimations |
39 | { | 39 | { |
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes | |||
66 | 66 | ||
67 | // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); | 67 | // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); |
68 | 68 | ||
69 | foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.Avatar.Animations.AnimsLLUUID) | 69 | foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID) |
70 | { | 70 | { |
71 | AnimsNames.Add(kp.Value, kp.Key); | 71 | AnimsNames.Add(kp.Value, kp.Key); |
72 | } | 72 | } |