OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-08-16 17:26:25 +00:00
parent 80186a68df
commit 6fa26f5b41
11 changed files with 192 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@ -65,7 +65,7 @@ namespace OpenSim.Framework.Communications.Cache
/// <param name="userID"></param> /// <param name="userID"></param>
public void AddNewUser(LLUUID userID) public void AddNewUser(LLUUID userID)
{ {
if(userID == LLUUID.Zero) if (userID == LLUUID.Zero)
return; return;
m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID); m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID);
GetUserDetails(userID); GetUserDetails(userID);
@ -132,7 +132,7 @@ namespace OpenSim.Framework.Communications.Cache
/// <returns>null if no user details are found</returns> /// <returns>null if no user details are found</returns>
public CachedUserInfo GetUserDetails(LLUUID userID) public CachedUserInfo GetUserDetails(LLUUID userID)
{ {
if(userID == LLUUID.Zero) if (userID == LLUUID.Zero)
return null; return null;
lock (m_userProfiles) lock (m_userProfiles)

2
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -2695,7 +2695,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
returnblock[0].Parameter = Helpers.StringToField(estateName); returnblock[0].Parameter = Helpers.StringToField(estateName);
// TODO: remove this cruft once MasterAvatar is fully deprecated // TODO: remove this cruft once MasterAvatar is fully deprecated
// //
if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.EstateOwner.ToString()); returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.EstateOwner.ToString());
else else
returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString()); returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());

2
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -123,7 +123,7 @@ namespace OpenSim.Region.Communications.OGS1
GridParams["server_uri"] = regionInfo.ServerURI; GridParams["server_uri"] = regionInfo.ServerURI;
GridParams["region_secret"] = regionInfo.regionSecret; GridParams["region_secret"] = regionInfo.regionSecret;
if(regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) if (regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString(); GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
else else
GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString(); GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();

2
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -96,7 +96,7 @@ namespace OpenSim.Region.Communications.OGS1
userData.CustomType = (string) data["custom_type"]; userData.CustomType = (string) data["custom_type"];
else else
userData.CustomType = ""; userData.CustomType = "";
if(userData.CustomType == null) if (userData.CustomType == null)
userData.CustomType = ""; userData.CustomType = "";
if (data.Contains("partner")) if (data.Contains("partner"))

2
OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
View File

@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
if (null != profile) if (null != profile)
{ {
Byte[] charterMember; Byte[] charterMember;
if(profile.CustomType == "") if (profile.CustomType == "")
{ {
charterMember = new Byte[1]; charterMember = new Byte[1];
charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8); charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8);

6
OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
View File

@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene); ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene);
fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
fullSimParcel.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; fullSimParcel.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
else else
fullSimParcel.landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; fullSimParcel.landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
@ -934,7 +934,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
{ {
if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, landList[local_id])) if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, landList[local_id]))
{ {
if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
else else
landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
@ -951,7 +951,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
{ {
if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id])) if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id]))
{ {
if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
else else
landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;

6
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -246,12 +246,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) if (m_scene.RegionInfo.EstateSettings.EstateOwner == user)
return true; return true;
} }
if(m_allowGridGods) if (m_allowGridGods)
{ {
CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user); CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user);
if(profile != null && profile.UserProfile != null) if (profile != null && profile.UserProfile != null)
{ {
if(profile.UserProfile.GodLevel >= 200) if (profile.UserProfile.GodLevel >= 200)
return true; return true;
} }
} }

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -2030,7 +2030,7 @@ namespace OpenSim.Region.Environment.Scenes
// who is granted god powers, but has no god level set. // who is granted god powers, but has no god level set.
// //
CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(agentID); CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(agentID);
if(profile.UserProfile.GodLevel > 0) if (profile.UserProfile.GodLevel > 0)
m_godlevel = profile.UserProfile.GodLevel; m_godlevel = profile.UserProfile.GodLevel;
else else
m_godlevel = 200; m_godlevel = 200;

46
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -5704,12 +5704,12 @@ namespace OpenSim.Region.ScriptEngine.Common
LSL_Types.list l = new LSL_Types.list(); LSL_Types.list l = new LSL_Types.list();
ScenePresence av = World.GetScenePresence(id); ScenePresence av = World.GetScenePresence(id);
if( av == null ) if (av == null)
return l; return l;
LLUUID[] anims; LLUUID[] anims;
anims = av.GetAnimationArray(); anims = av.GetAnimationArray();
foreach( LLUUID foo in anims ) foreach (LLUUID foo in anims)
l.Add( foo.ToString() ); l.Add(foo.ToString());
return l; return l;
} }
@ -6813,20 +6813,20 @@ namespace OpenSim.Region.ScriptEngine.Common
public void llParcelMediaCommandList(LSL_Types.list commandList) public void llParcelMediaCommandList(LSL_Types.list commandList)
{ {
//TO DO: Implement the missing commands //TO DO: Implement the missing commands
//PARCEL_MEDIA_COMMAND_STOP Stop the media stream and go back to the first frame. //PARCEL_MEDIA_COMMAND_STOP Stop the media stream and go back to the first frame.
//PARCEL_MEDIA_COMMAND_PAUSE Pause the media stream (stop playing but stay on current frame). //PARCEL_MEDIA_COMMAND_PAUSE Pause the media stream (stop playing but stay on current frame).
//PARCEL_MEDIA_COMMAND_PLAY Start the media stream playing from the current frame and stop when the end is reached. //PARCEL_MEDIA_COMMAND_PLAY Start the media stream playing from the current frame and stop when the end is reached.
//PARCEL_MEDIA_COMMAND_LOOP Start the media stream playing from the current frame. When the end is reached, loop to the beginning and continue. //PARCEL_MEDIA_COMMAND_LOOP Start the media stream playing from the current frame. When the end is reached, loop to the beginning and continue.
//PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture. //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture.
//PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url. //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url.
//PARCEL_MEDIA_COMMAND_TIME float time Move a media stream to a specific time. //PARCEL_MEDIA_COMMAND_TIME float time Move a media stream to a specific time.
//PARCEL_MEDIA_COMMAND_AGENT key uuid Applies the media command to the specified agent only. //PARCEL_MEDIA_COMMAND_AGENT key uuid Applies the media command to the specified agent only.
//PARCEL_MEDIA_COMMAND_UNLOAD Completely unloads the movie and restores the original texture. //PARCEL_MEDIA_COMMAND_UNLOAD Completely unloads the movie and restores the original texture.
//PARCEL_MEDIA_COMMAND_AUTO_ALIGN integer boolean Sets the parcel option 'Auto scale content'. //PARCEL_MEDIA_COMMAND_AUTO_ALIGN integer boolean Sets the parcel option 'Auto scale content'.
//PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later)
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
for (int i = 0; i < commandList.Data.Length; i++) for (int i = 0; i < commandList.Data.Length; i++)
{ {
@ -6904,12 +6904,12 @@ namespace OpenSim.Region.ScriptEngine.Common
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
LSL_Types.list list = new LSL_Types.list(); LSL_Types.list list = new LSL_Types.list();
//TO DO: make the implementation for the missing commands //TO DO: make the implementation for the missing commands
//PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture. //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture.
//PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url. //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url.
//PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later)
for (int i = 0; i < aList.Data.Length; i++) for (int i = 0; i < aList.Data.Length; i++)
{ {

162
OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
View File

@ -634,97 +634,97 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
} }
private class AlphanumComparatorFast : IComparer private class AlphanumComparatorFast : IComparer
{ {
public int Compare(object x, object y) public int Compare(object x, object y)
{ {
string s1 = x as string; string s1 = x as string;
if (s1 == null) if (s1 == null)
{ {
return 0; return 0;
} }
string s2 = y as string; string s2 = y as string;
if (s2 == null) if (s2 == null)
{ {
return 0; return 0;
} }
int len1 = s1.Length; int len1 = s1.Length;
int len2 = s2.Length; int len2 = s2.Length;
int marker1 = 0; int marker1 = 0;
int marker2 = 0; int marker2 = 0;
// Walk through two the strings with two markers. // Walk through two the strings with two markers.
while (marker1 < len1 && marker2 < len2) while (marker1 < len1 && marker2 < len2)
{ {
char ch1 = s1[marker1]; char ch1 = s1[marker1];
char ch2 = s2[marker2]; char ch2 = s2[marker2];
// Some buffers we can build up characters in for each chunk. // Some buffers we can build up characters in for each chunk.
char[] space1 = new char[len1]; char[] space1 = new char[len1];
int loc1 = 0; int loc1 = 0;
char[] space2 = new char[len2]; char[] space2 = new char[len2];
int loc2 = 0; int loc2 = 0;
// Walk through all following characters that are digits or // Walk through all following characters that are digits or
// characters in BOTH strings starting at the appropriate marker. // characters in BOTH strings starting at the appropriate marker.
// Collect char arrays. // Collect char arrays.
do do
{ {
space1[loc1++] = ch1; space1[loc1++] = ch1;
marker1++; marker1++;
if (marker1 < len1) if (marker1 < len1)
{ {
ch1 = s1[marker1]; ch1 = s1[marker1];
} }
else else
{ {
break; break;
} }
} while (char.IsDigit(ch1) == char.IsDigit(space1[0])); } while (char.IsDigit(ch1) == char.IsDigit(space1[0]));
do do
{ {
space2[loc2++] = ch2; space2[loc2++] = ch2;
marker2++; marker2++;
if (marker2 < len2) if (marker2 < len2)
{ {
ch2 = s2[marker2]; ch2 = s2[marker2];
} }
else else
{ {
break; break;
} }
} while (char.IsDigit(ch2) == char.IsDigit(space2[0])); } while (char.IsDigit(ch2) == char.IsDigit(space2[0]));
// If we have collected numbers, compare them numerically. // If we have collected numbers, compare them numerically.
// Otherwise, if we have strings, compare them alphabetically. // Otherwise, if we have strings, compare them alphabetically.
string str1 = new string(space1); string str1 = new string(space1);
string str2 = new string(space2); string str2 = new string(space2);
int result; int result;
if (char.IsDigit(space1[0]) && char.IsDigit(space2[0])) if (char.IsDigit(space1[0]) && char.IsDigit(space2[0]))
{ {
int thisNumericChunk = int.Parse(str1); int thisNumericChunk = int.Parse(str1);
int thatNumericChunk = int.Parse(str2); int thatNumericChunk = int.Parse(str2);
result = thisNumericChunk.CompareTo(thatNumericChunk); result = thisNumericChunk.CompareTo(thatNumericChunk);
} }
else else
{ {
result = str1.CompareTo(str2); result = str1.CompareTo(str2);
} }
if (result != 0) if (result != 0)
{ {
return result; return result;
} }
} }
return len1 - len2; return len1 - len2;
} }
} }
public list Sort(int stride, int ascending) public list Sort(int stride, int ascending)
{ {

150
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -1019,7 +1019,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LLObject.TextureEntry tex = part.Shape.Textures; LLObject.TextureEntry tex = part.Shape.Textures;
if (face > -1) if (face > -1)
{ {
tex.CreateFace((uint) face); tex.CreateFace((uint) face);
tex.FaceTextures[face].Glow = glow; tex.FaceTextures[face].Glow = glow;
part.UpdateTexture(tex); part.UpdateTexture(tex);
return; return;
@ -1032,63 +1032,63 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
tex.FaceTextures[i].Glow = glow; tex.FaceTextures[i].Glow = glow;
} }
tex.DefaultTexture.Glow = glow; tex.DefaultTexture.Glow = glow;
} }
part.UpdateTexture(tex); part.UpdateTexture(tex);
return; return;
} }
} }
public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
{ {
Shininess sval = new Shininess(); Shininess sval = new Shininess();
switch (shiny) switch (shiny)
{ {
case 0: case 0:
sval = Shininess.None; sval = Shininess.None;
break; break;
case 1: case 1:
sval = Shininess.Low; sval = Shininess.Low;
break; break;
case 2: case 2:
sval = Shininess.Medium; sval = Shininess.Medium;
break; break;
case 3: case 3:
sval = Shininess.High; sval = Shininess.High;
break; break;
default: default:
sval = Shininess.None; sval = Shininess.None;
break; break;
} }
LLObject.TextureEntry tex = part.Shape.Textures; LLObject.TextureEntry tex = part.Shape.Textures;
if (face > -1) if (face > -1)
{ {
tex.CreateFace((uint) face); tex.CreateFace((uint) face);
tex.FaceTextures[face].Shiny = sval; tex.FaceTextures[face].Shiny = sval;
tex.FaceTextures[face].Bump = bump; tex.FaceTextures[face].Bump = bump;
part.UpdateTexture(tex); part.UpdateTexture(tex);
return; return;
} }
else if (face == -1) else if (face == -1)
{ {
for (uint i = 0; i < 32; i++) for (uint i = 0; i < 32; i++)
{ {
if (tex.FaceTextures[i] != null) if (tex.FaceTextures[i] != null)
{ {
tex.FaceTextures[i].Shiny = sval; tex.FaceTextures[i].Shiny = sval;
tex.FaceTextures[i].Bump = bump;; tex.FaceTextures[i].Bump = bump;;
} }
tex.DefaultTexture.Shiny = sval; tex.DefaultTexture.Shiny = sval;
tex.DefaultTexture.Bump = bump; tex.DefaultTexture.Bump = bump;
} }
part.UpdateTexture(tex); part.UpdateTexture(tex);
return; return;
} }
} }
public double llGetAlpha(int face) public double llGetAlpha(int face)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
@ -5484,21 +5484,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
face = Convert.ToInt32(rules.Data[idx++]); face = Convert.ToInt32(rules.Data[idx++]);
float glow = (float)Convert.ToDouble(rules.Data[idx++]); float glow = (float)Convert.ToDouble(rules.Data[idx++]);
SetGlow(part, face, glow); SetGlow(part, face, glow);
break; break;
case (int)ScriptBaseClass.PRIM_BUMP_SHINY: case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
if (remain < 3) if (remain < 3)
return; return;
face = Convert.ToInt32(rules.Data[idx++]); face = Convert.ToInt32(rules.Data[idx++]);
int shiny = Convert.ToInt32(rules.Data[idx++]); int shiny = Convert.ToInt32(rules.Data[idx++]);
Bumpiness bump = (Bumpiness)Convert.ToByte(rules.Data[idx++]); Bumpiness bump = (Bumpiness)Convert.ToByte(rules.Data[idx++]);
SetShiny(part, face, shiny, bump); SetShiny(part, face, shiny, bump);
break; break;
} }
} }
} }
@ -5568,12 +5568,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LSL_Types.list l = new LSL_Types.list(); LSL_Types.list l = new LSL_Types.list();
ScenePresence av = World.GetScenePresence(id); ScenePresence av = World.GetScenePresence(id);
if( av == null ) if (av == null)
return l; return l;
LLUUID[] anims; LLUUID[] anims;
anims = av.GetAnimationArray(); anims = av.GetAnimationArray();
foreach( LLUUID foo in anims ) foreach (LLUUID foo in anims)
l.Add( foo.ToString() ); l.Add(foo.ToString());
return l; return l;
} }
@ -6662,20 +6662,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llParcelMediaCommandList(LSL_Types.list commandList) public void llParcelMediaCommandList(LSL_Types.list commandList)
{ {
//TO DO: Implement the missing commands //TO DO: Implement the missing commands
//PARCEL_MEDIA_COMMAND_STOP Stop the media stream and go back to the first frame. //PARCEL_MEDIA_COMMAND_STOP Stop the media stream and go back to the first frame.
//PARCEL_MEDIA_COMMAND_PAUSE Pause the media stream (stop playing but stay on current frame). //PARCEL_MEDIA_COMMAND_PAUSE Pause the media stream (stop playing but stay on current frame).
//PARCEL_MEDIA_COMMAND_PLAY Start the media stream playing from the current frame and stop when the end is reached. //PARCEL_MEDIA_COMMAND_PLAY Start the media stream playing from the current frame and stop when the end is reached.
//PARCEL_MEDIA_COMMAND_LOOP Start the media stream playing from the current frame. When the end is reached, loop to the beginning and continue. //PARCEL_MEDIA_COMMAND_LOOP Start the media stream playing from the current frame. When the end is reached, loop to the beginning and continue.
//PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture. //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture.
//PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url. //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url.
//PARCEL_MEDIA_COMMAND_TIME float time Move a media stream to a specific time. //PARCEL_MEDIA_COMMAND_TIME float time Move a media stream to a specific time.
//PARCEL_MEDIA_COMMAND_AGENT key uuid Applies the media command to the specified agent only. //PARCEL_MEDIA_COMMAND_AGENT key uuid Applies the media command to the specified agent only.
//PARCEL_MEDIA_COMMAND_UNLOAD Completely unloads the movie and restores the original texture. //PARCEL_MEDIA_COMMAND_UNLOAD Completely unloads the movie and restores the original texture.
//PARCEL_MEDIA_COMMAND_AUTO_ALIGN integer boolean Sets the parcel option 'Auto scale content'. //PARCEL_MEDIA_COMMAND_AUTO_ALIGN integer boolean Sets the parcel option 'Auto scale content'.
//PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later)
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
for (int i = 0; i < commandList.Data.Length; i++) for (int i = 0; i < commandList.Data.Length; i++)
{ {
@ -6753,12 +6753,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
LSL_Types.list list = new LSL_Types.list(); LSL_Types.list list = new LSL_Types.list();
//TO DO: make the implementation for the missing commands //TO DO: make the implementation for the missing commands
//PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture. //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture.
//PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url. //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url.
//PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later)
//PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later) //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later)
for (int i = 0; i < aList.Data.Length; i++) for (int i = 0; i < aList.Data.Length; i++)
{ {