Applied the looping fix for llParcelMediaCommandList to the 0.6.2 post fixes branch.

OpenSim/Data/MySQL/MySQLAssetData.cs

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

OpenSim/Grid/UserServer/UserLoginService.cs

@@ -251,7 +251,7 @@ namespace OpenSim.Grid.UserServer
                     else
                     {
                         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]";

OpenSim/Region/Application/HGOpenSimNode.cs

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

OpenSim/Region/Communications/Local/LocalLoginService.cs

@@ -210,7 +210,7 @@ namespace OpenSim.Region.Communications.Local
                     else
                     {
                         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]";

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

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