From 0be7f9d804ebb3a8e7f23464a18e84b4bc67e59b Mon Sep 17 00:00:00 2001 From: "Huaiyu (Kitty) Liu" Date: Tue, 31 May 2011 12:54:22 -0700 Subject: [PATCH] Fixed bug in GridDialogModule that sends infinite Dialog messages. Added ScheduleFullUpdate to llSetObjectName, so that the property change is captured by sync module. --- .../RegionSyncModule/SymmetricSync/GridDialogModule.cs | 2 +- .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/GridDialogModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/GridDialogModule.cs index 247508b896..149831bf6c 100755 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/GridDialogModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/GridDialogModule.cs @@ -198,7 +198,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule msgdata["region_handle"] = 0; bool imresult = doDialogSending(reginfo, msgdata); - if (imresult) + if (!imresult) { SendGridDialogViaXMLRPCAsync(avatarID, objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels, prevRegionID); } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 05ed19cdd1..fef80e0b0b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -5413,6 +5413,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); m_host.Name = name!=null?name:String.Empty; + + //DSG SYNC + m_host.ScheduleFullUpdate(new List() { SceneObjectPartSyncProperties.Name }); } public LSL_String llGetDate()