Compare commits

...

5 Commits

5 changed files with 26 additions and 6 deletions

View File

@ -142,7 +142,16 @@ namespace OpenSim.Data.MySQL
asset.Data = (byte[]) dbReader["data"]; asset.Data = (byte[]) dbReader["data"];
asset.Description = (string) dbReader["description"]; asset.Description = (string) dbReader["description"];
asset.FullID = assetID; asset.FullID = assetID;
asset.Local = (bool)dbReader["local"];
try
{
asset.Local = (bool)dbReader["local"];
}
catch (System.InvalidCastException)
{
asset.Local = false;
}
asset.Name = (string) dbReader["name"]; asset.Name = (string) dbReader["name"];
asset.Type = (sbyte) dbReader["assetType"]; asset.Type = (sbyte) dbReader["assetType"];
} }

View File

@ -251,7 +251,7 @@ namespace OpenSim.Grid.UserServer
else else
{ {
theUser.CurrentAgent.Position = new Vector3(float.Parse(uriMatch.Groups["x"].Value), theUser.CurrentAgent.Position = new Vector3(float.Parse(uriMatch.Groups["x"].Value),
float.Parse(uriMatch.Groups["y"].Value), float.Parse(uriMatch.Groups["x"].Value)); float.Parse(uriMatch.Groups["y"].Value), float.Parse(uriMatch.Groups["z"].Value));
} }
} }
response.LookAt = "[r0,r1,r0]"; response.LookAt = "[r0,r1,r0]";

View File

@ -215,7 +215,7 @@ namespace OpenSim
} }
private void LoadXmlLinkFile(string[] cmdparams) public void LoadXmlLinkFile(string[] cmdparams)
{ {
try try
{ {

View File

@ -210,7 +210,7 @@ namespace OpenSim.Region.Communications.Local
else else
{ {
theUser.CurrentAgent.Position = new Vector3(float.Parse(uriMatch.Groups["x"].Value), theUser.CurrentAgent.Position = new Vector3(float.Parse(uriMatch.Groups["x"].Value),
float.Parse(uriMatch.Groups["y"].Value), float.Parse(uriMatch.Groups["x"].Value)); float.Parse(uriMatch.Groups["y"].Value), float.Parse(uriMatch.Groups["z"].Value));
} }
} }
response.LookAt = "[r0,r1,r0]"; response.LookAt = "[r0,r1,r0]";

View File

@ -7822,6 +7822,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!World.Permissions.CanEditParcel(m_host.ObjectOwner, landObject)) return; if (!World.Permissions.CanEditParcel(m_host.ObjectOwner, landObject)) return;
bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)?
byte loop = 0;
LandData landData = landObject.landData; LandData landData = landObject.landData;
string url = landData.MediaURL; string url = landData.MediaURL;
@ -7860,7 +7861,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
break; break;
case ParcelMediaCommandEnum.Loop: case ParcelMediaCommandEnum.Loop:
loop = 1;
commandToSend = command;
update = true; //need to send the media update packet to set looping
break;
case ParcelMediaCommandEnum.Play: case ParcelMediaCommandEnum.Play:
loop = 0;
commandToSend = command;
update = true; //need to send the media update packet to make sure it doesn't loop
break;
case ParcelMediaCommandEnum.Pause: case ParcelMediaCommandEnum.Pause:
case ParcelMediaCommandEnum.Stop: case ParcelMediaCommandEnum.Stop:
case ParcelMediaCommandEnum.Unload: case ParcelMediaCommandEnum.Unload:
@ -7994,7 +8005,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
mediaType, mediaType,
description, description,
width, height, width, height,
1); // TODO do some LOOP logic here loop); // TODO do some LOOP logic here
} }
} }
else if (!presence.IsChildAgent) else if (!presence.IsChildAgent)
@ -8006,7 +8017,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
mediaType, mediaType,
description, description,
width, height, width, height,
1); // TODO do some LOOP logic here loop); // TODO do some LOOP logic here
} }
} }