Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs
index 5ceaf39..ee7dec8 100644
--- a/OpenSim/Framework/Communications/Clients/RegionClient.cs
+++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Communications.Clients
             }
             // Add the regionhandle of the destination region
             ulong regionHandle = GetRegionHandle(region.RegionHandle);
-            args["destination_handle"] = OSD.FromString(regionHandle.ToString());

+            args["destination_handle"] = OSD.FromString(regionHandle.ToString());
             args["teleport_flags"] = OSD.FromString(teleportFlags.ToString());
 
             string strBuffer = "";
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 3489af1..3f53258 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1447,10 +1447,10 @@ namespace OpenSim.Framework
         
         void SendUseCachedMuteList();
 
-        void SendMuteListUpdate(string filename);

-

-        void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);

-

+        void SendMuteListUpdate(string filename);
+
+        void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
+
         void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes);
 
         void KillEndDone();