Merge branch '0.6.9-post-fixes' into careminster

11 files changed, 47 insertions, 144 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
index 4abc215..d68c683 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             {
                 if (s.RegionInfo.RegionHandle == regionHandle)
                 {
-                    m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
+                    //m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
                     if (isLocalCall)
                     {
                         // We need to make a local copy of the object
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 4019c12..cedf405 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2458,8 +2458,6 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
-            m_log.DebugFormat("[SCENE INVENTORY]: {0} {1} IsAttachment={2}", att.Name, att.LocalId, att.IsAttachment);
-            Console.WriteLine("HERE X");
             ScenePresence presence;
             if (TryGetAvatar(remoteClient.AgentId, out presence))
             {
@@ -2467,12 +2465,9 @@ namespace OpenSim.Region.Framework.Scenes
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = InventoryService.GetItem(item);
                 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
-                Console.WriteLine("HERE Y");
 
                 if (m_AvatarFactory != null)
                     m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
-
-                Console.WriteLine("HERE Z");
             }
         }
 
@@ -2655,4 +2650,4 @@ namespace OpenSim.Region.Framework.Scenes
             m_sceneGraph.LinkObjects(root, children);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index d8e604f..ac04dc7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -124,7 +124,6 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (((SceneObjectGroup)ent).LocalId == primLocalID)
                     {
-                        m_log.DebugFormat("[SCENE]: Received full update request for {0} from {1}", primLocalID, remoteClient.Name);
                         ((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient);
                         return;
                     }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a3c5a03..4bd3222 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1891,31 +1891,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// true if the object was added, false if an object with the same uuid was already in the scene
         /// </returns>
         public bool AddRestoredSceneObject(
-            SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
-        {
-            return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates);
-        }        
-
-        /// <summary>
-        /// Add an object into the scene that has come from storage
-        /// </summary>
-        ///
-        /// <param name="sceneObject"></param>
-        /// <param name="attachToBackup">
-        /// If true, changes to the object will be reflected in its persisted data
-        /// If false, the persisted data will not be changed even if the object in the scene is changed
-        /// </param>
-        /// <param name="alreadyPersisted">
-        /// If true, we won't persist this object until it changes
-        /// If false, we'll persist this object immediately
-        /// </param>
-        /// <returns>
-        /// true if the object was added, false if an object with the same uuid was already in the scene
-        /// </returns>
-        public bool AddRestoredSceneObject(
             SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
         {
-            return AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, true);
+            return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted);
         }
 
         /// <summary>
@@ -2528,7 +2506,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public bool IncomingCreateObject(ISceneObject sog)
         {
-            m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
+            //m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
             SceneObjectGroup newObject;
             try
             {
@@ -2600,12 +2578,10 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (sceneObject.IsAttachmentCheckFull()) // Attachment
             {
-                m_log.DebugFormat("[SCENE]: Adding attachment {0} {1}", sceneObject.Name, sceneObject.LocalId);
-                
                 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
                 sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
 
-                AddRestoredSceneObject(sceneObject, false, false, false);
+                AddRestoredSceneObject(sceneObject, false, false);
 
                 // Handle attachment special case
                 SceneObjectPart RootPrim = sceneObject.RootPart;
@@ -2613,8 +2589,6 @@ namespace OpenSim.Region.Framework.Scenes
                 // Fix up attachment Parent Local ID
                 ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
 
-                Console.WriteLine("AAAA");
-
                 //uint parentLocalID = 0;
                 if (sp != null)
                 {
@@ -2633,25 +2607,20 @@ namespace OpenSim.Region.Framework.Scenes
                     //grp.SetFromAssetID(grp.RootPart.LastOwnerID);
                     m_log.DebugFormat(
                         "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
-
-                    RootPrim.RemFlag(PrimFlags.TemporaryOnRez);                    
+                    
                     AttachObject(
                         sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false);
-                    
-                    //grp.SendGroupFullUpdate();
+                    RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
+                    grp.SendGroupFullUpdate();
                 }
                 else
                 {
                     RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
                     RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
                 }
-
-                Console.WriteLine("BBBB");
             }
             else
             {
-                m_log.DebugFormat("[SCENE]: Adding ordinary object {0} {1}", sceneObject.Name, sceneObject.LocalId);
-                
                 AddRestoredSceneObject(sceneObject, true, false);
 
                 if (!Permissions.CanObjectEntry(sceneObject.UUID,
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 9153069..04626d3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1410,9 +1410,7 @@ namespace OpenSim.Region.Framework.Scenes
                 // now we have a child agent in this region. Request all interesting data about other (root) agents
                 agent.SendInitialFullUpdateToAllClients();
 
-                Console.WriteLine("SCS 1");
                 agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true);
-                Console.WriteLine("SCS 2");                
 
                 //                    m_scene.SendKillObject(m_localId);
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index fb01140..730ec31 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -216,15 +216,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// If true, we won't persist this object until it changes
         /// If false, we'll persist this object immediately
         /// </param>
-        /// <param name="sendClientUpdate">
-        /// If true, we send updates to the client to tell it about this object
-        /// If false, we leave it up to the caller to do this
-        /// </param>
         /// <returns>
         /// true if the object was added, false if an object with the same uuid was already in the scene
         /// </returns>
         protected internal bool AddRestoredSceneObject(
-            SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
+            SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
         {
                 // KF: Check for out-of-region, move inside and make static.
                         Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X,
@@ -256,29 +252,8 @@ namespace OpenSim.Region.Framework.Scenes
                 sceneObject.HasGroupChanged = true;
             }
 
-            return AddSceneObject(sceneObject, attachToBackup, sendClientUpdates);
+            return AddSceneObject(sceneObject, attachToBackup, true);
         }
-        
-//        /// <summary>
-//        /// Add an object into the scene that has come from storage
-//        /// </summary>
-//        /// <param name="sceneObject"></param>
-//        /// <param name="attachToBackup">
-//        /// If true, changes to the object will be reflected in its persisted data
-//        /// If false, the persisted data will not be changed even if the object in the scene is changed
-//        /// </param>
-//        /// <param name="alreadyPersisted">
-//        /// If true, we won't persist this object until it changes
-//        /// If false, we'll persist this object immediately
-//        /// </param>
-//        /// <returns>
-//        /// true if the object was added, false if an object with the same uuid was already in the scene
-//        /// </returns>
-//        protected internal bool AddRestoredSceneObject(
-//            SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
-//        {
-//            AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, true);
-//        }
 
         /// <summary>
         /// Add a newly created object to the scene.  This will both update the scene, and send information about the
@@ -672,13 +647,11 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal bool AttachObject(
             IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
         {
-            Console.WriteLine("HERE A");
             SceneObjectGroup group = GetGroupByPrim(objectLocalID);
             if (group != null)
             {
                 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
                 {
-                    Console.WriteLine("HERE -1");
                     // If the attachment point isn't the same as the one previously used
                     // set it's offset position = 0 so that it appears on the attachment point
                     // and not in a weird location somewhere unknown.
@@ -717,12 +690,9 @@ namespace OpenSim.Region.Framework.Scenes
                         itemId = group.GetFromItemID();
                     }
 
-                    Console.WriteLine("HERE 0");
                     m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group);
 
-                    Console.WriteLine("HERE 1");
                     group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
-                    Console.WriteLine("HERE 2");
                     // In case it is later dropped again, don't let
                     // it get cleaned up
                     //
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 318357d..edaf1a0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1651,10 +1651,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SendFullUpdateToClient(IClientAPI remoteClient)
         {
-            if (IsAttachment)
-                m_log.DebugFormat(
-                    "[SOG]: Sending full update to client {0} for {1} {2}", remoteClient.Name, Name, LocalId);
-            
             SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID));
 
             lockPartsForRead(true);
@@ -1677,9 +1673,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="part"></param>
         internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags)
         {
-            if (IsAttachment)
-                m_log.DebugFormat(
-                    "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
+//            m_log.DebugFormat(
+//                "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
             
             if (m_rootPart.UUID == part.UUID)
             {
@@ -2191,8 +2186,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void ScheduleFullUpdateToAvatar(ScenePresence presence)
         {
-            if (IsAttachment)
-                m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name);
+//            m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name);
             
             RootPart.AddFullUpdateToAvatar(presence);
 
@@ -2228,8 +2222,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void ScheduleGroupForFullUpdate()
         {
-            if (IsAttachment)
-                m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID);
+//            m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID);
             
             checkAtTargets();
             RootPart.ScheduleFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3a101cc..548a64f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1270,17 +1270,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// Tell all scene presences that they should send updates for this part to their clients
         /// </summary>
         public void AddFullUpdateToAllAvatars()
-        {                        
+        {
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
-                AddFullUpdateToAvatar(avatars[i]);
+            {
+                avatars[i].SceneViewer.QueuePartForUpdate(this);
+            }
         }
 
         public void AddFullUpdateToAvatar(ScenePresence presence)
         {
-            if (IsAttachment)
-                m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
-            
             presence.SceneViewer.QueuePartForUpdate(this);
         }
 
@@ -1299,14 +1298,13 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
-                AddTerseUpdateToAvatar(avatars[i]);
+            {
+                avatars[i].SceneViewer.QueuePartForUpdate(this);
+            }
         }
 
         public void AddTerseUpdateToAvatar(ScenePresence presence)
         {
-            if (IsAttachment)
-                m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
-            
             presence.SceneViewer.QueuePartForUpdate(this);
         }
 
@@ -2715,8 +2713,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void ScheduleFullUpdate()
         {
-            if (IsAttachment)
-                m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId);
+//            m_log.DebugFormat("[SCENE OBJECT PART]: Scheduling full update for {0} {1}", Name, LocalId);
             
             if (m_parentGroup != null)
             {
@@ -2829,10 +2826,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="remoteClient"></param>
         public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
         {
-            if (IsAttachment)
-                m_log.DebugFormat(
-                    "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId);
-            
             m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags);
         }
 
@@ -2841,10 +2834,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendFullUpdateToAllClients()
         {
-            if (IsAttachment)
-                m_log.DebugFormat(
-                    "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId);
-            
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
             {
@@ -2856,10 +2845,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SendFullUpdateToAllClientsExcept(UUID agentID)
         {
-            if (IsAttachment)
-                m_log.DebugFormat(
-                    "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID);
-            
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
             {
@@ -2968,9 +2953,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
                 {
-                    if (IsAttachment)
-                        m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId);
-                    
                     AddFullUpdateToAllAvatars();
                     m_updateFlag = 0; //Same here
                 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index f88605b..1cff0eb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -27,7 +27,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
@@ -40,8 +39,6 @@ namespace OpenSim.Region.Framework.Scenes
 {
     public class SceneViewer : ISceneViewer
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
         protected ScenePresence m_presence;
         protected UpdateQueue m_partsUpdateQueue = new UpdateQueue();
         protected Queue<SceneObjectGroup> m_pendingObjects;
@@ -63,9 +60,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="part"></param>
         public void QueuePartForUpdate(SceneObjectPart part)
         {
-            if (part.IsAttachment)
-                m_log.DebugFormat("[SCENE VIEWER]: Queueing part {0} {1} for update", part.Name, part.LocalId);
-            
             lock (m_partsUpdateQueue)
             {
                 m_partsUpdateQueue.Enqueue(part);
@@ -140,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     else if (update.LastTerseUpdateTime <= part.TimeStampTerse)
                     {
-//                            m_log.DebugFormat(AddFullUpdateToAvatar
+//                            m_log.DebugFormat(
 //                                "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}",
 //                                part.Name, part.UUID, part.TimeStampTerse);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index d8c0ba5..959164b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -32,7 +32,7 @@ using System.Globalization;
 using System.Reflection;
 using System.IO;
 using Microsoft.CSharp;
-using Microsoft.JScript;
+//using Microsoft.JScript;
 using Microsoft.VisualBasic;
 using log4net;
 using OpenSim.Region.Framework.Interfaces;
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
         private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
         private static VBCodeProvider VBcodeProvider = new VBCodeProvider();
-        private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider();
+//        private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider();
         private static CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp
         private static YP2CSConverter YP_Converter = new YP2CSConverter();
 
@@ -395,9 +395,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 case enumCompileType.vb:
                     compileScript = CreateVBCompilerScript(compileScript);
                     break;
-                case enumCompileType.js:
-                    compileScript = CreateJSCompilerScript(compileScript);
-                    break;
+//                case enumCompileType.js:
+//                    compileScript = CreateJSCompilerScript(compileScript);
+//                    break;
                 case enumCompileType.yp:
                     compileScript = CreateYPCompilerScript(compileScript);
                     break;
@@ -420,16 +420,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             }
         }
 
-        private static string CreateJSCompilerScript(string compileScript)
-        {
-            compileScript = String.Empty +
-                "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" +
-                "package SecondLife {\r\n" +
-                "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" +
-                compileScript +
-                "} }\r\n";
-            return compileScript;
-        }
+//        private static string CreateJSCompilerScript(string compileScript)
+//        {
+//            compileScript = String.Empty +
+//                "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" +
+//                "package SecondLife {\r\n" +
+//                "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" +
+//                compileScript +
+//                "} }\r\n";
+//            return compileScript;
+//        }
 
         private static string CreateCSCompilerScript(string compileScript)
         {
@@ -580,10 +580,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                         }
                     } while (!complete);
                     break;
-                case enumCompileType.js:
-                    results = JScodeProvider.CompileAssemblyFromSource(
-                        parameters, Script);
-                    break;
+//                case enumCompileType.js:
+//                    results = JScodeProvider.CompileAssemblyFromSource(
+//                        parameters, Script);
+//                    break;
                 case enumCompileType.yp:
                     results = YPcodeProvider.CompileAssemblyFromSource(
                         parameters, Script);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 6ecafd4..a299dba 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -542,7 +542,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 m_CurrentResult = null;
             }
 
-            return true;
+            return false;
         }
 
         [DebuggerNonUserCode] //Prevents the debugger from farting in this function
@@ -998,7 +998,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         public string GetXMLState()
         {
             bool run = Running;
-            Stop(100);
+            bool stopped = Stop(100);
             Running = run;
 
             // We should not be doing this, but since we are about to
@@ -1009,6 +1009,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             // Force an update of the in-memory plugin data
             //
+            if (!stopped)
+                return String.Empty;
+
             PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID);
 
             return ScriptSerializer.Serialize(this);