From d3754911424fd195107f7ec9a0957bf3c1f16edc Mon Sep 17 00:00:00 2001
From: "Huaiyu (Kitty) Liu" <huaiyu.liu@intel.com>
Date: Fri, 27 May 2011 14:10:36 -0700
Subject: [PATCH] Fixed bugs in GridDialogModule.cs, llDialog now works in DSG
 mode in preliminary tests.

---
 .../CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs | 2 +-
 .../RegionSyncModule/SymmetricSync/ClientManagerSyncModule.cs   | 2 +-
 .../RegionSyncModule/SymmetricSync/PhysicsEngineSyncModule.cs   | 2 +-
 .../RegionSyncModule/SymmetricSync/RegionSyncModule.cs          | 2 +-
 .../SymmetricSync/ScenePersistenceSyncModule.cs                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs
index 329e29a26d..c7f56f257b 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs
@@ -621,7 +621,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
 
             if (gridDialogModule != null)
             {
-                gridDialogModule.SendGridDialogViaXMLRPCAsync(this.AgentId, objectname, objectID, ownerFirstName, ownerLastName,
+                gridDialogModule.SendGridDialogViaXMLRPC(this.AgentId, objectname, objectID, ownerFirstName, ownerLastName,
                     msg, textureID, ch, buttonlabels, UUID.Zero);
             }
         }
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/ClientManagerSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/ClientManagerSyncModule.cs
index a21f9b4fb2..bb563c242c 100755
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/ClientManagerSyncModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/ClientManagerSyncModule.cs
@@ -40,7 +40,7 @@ using Mono.Addins;
 namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
 {
 
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ClientManagerSyncModule")]
     public class ClientManagerSyncModule : INonSharedRegionModule, IDSGActorSyncModule
     {
         #region INonSharedRegionModule
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/PhysicsEngineSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/PhysicsEngineSyncModule.cs
index 1b99a367ed..d0160f2ac9 100755
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/PhysicsEngineSyncModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/PhysicsEngineSyncModule.cs
@@ -40,7 +40,7 @@ using Mono.Addins;
 namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
 {
 
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "PhysicsEngineSyncModule")]
     public class PhysicsEngineSyncModule : INonSharedRegionModule, IDSGActorSyncModule
     {
         #region INonSharedRegionModule
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
index 128fbd0575..57969c9953 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
@@ -50,7 +50,7 @@ using OpenMetaverse.StructuredData;
 /////////////////////////////////////////////////////////////////////////////////////////////
 namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionSyncModule")]
     public class RegionSyncModule : INonSharedRegionModule, IRegionSyncModule, ICommandableModule, ISyncStatistics
     //public class RegionSyncModule : IRegionModule, IRegionSyncModule, ICommandableModule
     {
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/ScenePersistenceSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/ScenePersistenceSyncModule.cs
index 262dfeeaa1..9ef2dcbfaf 100755
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/ScenePersistenceSyncModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/ScenePersistenceSyncModule.cs
@@ -39,7 +39,7 @@ using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ScenePersistenceSyncModule")]
     public class ScenePersistenceSyncModule : INonSharedRegionModule, IDSGActorSyncModule    
     {
         #region INonSharedRegionModule