ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

* This is the fabled LibOMV update with all of the libOMV types from JHurliman

Browse Source 
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point.  Regular people should let the dust settle.
* This has been tested to work with most basic functions. However..   make sure you back up 'everything' before using this.  It's that big!  
* Essentially we're back at square 1 in the testing phase..  so lets identify things that broke.
This commit is contained in:
Teravus Ovares
2008-09-06 07:52:41 +00:00
parent cbec2bf22b
commit 7d89e12293
388 changed files with 6811 additions and 7138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Environment/Scenes/AnimationSet.cs
View File

@@ -27,7 +27,7 @@
using System;
using System.Collections.Generic;
using libsecondlife;
using OpenMetaverse;
namespace OpenSim.Region.Environment.Scenes
{
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Scenes
ResetDefaultAnimation();
}
public bool HasAnimation(LLUUID animID)
public bool HasAnimation(UUID animID)
{
if (m_defaultAnimation.AnimID == animID)
return true;
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Environment.Scenes
return false;
}
public bool Add(LLUUID animID, int sequenceNum)
public bool Add(UUID animID, int sequenceNum)
{
lock (m_animations)
{
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Environment.Scenes
return false;
}
public bool Remove(LLUUID animID)
public bool Remove(UUID animID)
{
lock (m_animations)
{
@@ -103,7 +103,7 @@ namespace OpenSim.Region.Environment.Scenes
/// The default animation is reserved for "main" animations
/// that are mutually exclusive, e.g. flying and sitting.
/// </summary>
public bool SetDefaultAnimation(LLUUID animID, int sequenceNum)
public bool SetDefaultAnimation(UUID animID, int sequenceNum)
{
if (m_defaultAnimation.AnimID != animID)
{
@@ -123,18 +123,18 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
public bool TrySetDefaultAnimation(string anim, int sequenceNum)
{
if (Animations.AnimsLLUUID.ContainsKey(anim))
if (Animations.AnimsUUID.ContainsKey(anim))
{
return SetDefaultAnimation(Animations.AnimsLLUUID[anim], sequenceNum);
return SetDefaultAnimation(Animations.AnimsUUID[anim], sequenceNum);
}
return false;
}
public void GetArrays(out LLUUID[] animIDs, out int[] sequenceNums)
public void GetArrays(out UUID[] animIDs, out int[] sequenceNums)
{
lock (m_animations)
{
animIDs = new LLUUID[m_animations.Count + 1];
animIDs = new UUID[m_animations.Count + 1];
sequenceNums = new int[m_animations.Count + 1];
animIDs[0] = m_defaultAnimation.AnimID;