Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
author: Melanie 2011-12-05 17:10:51 +0000
committer: Melanie 2011-12-05 17:10:51 +0000
commit: 5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc (patch)
tree: 537b010672277073530cf013434fa046aabfec7e /OpenSim/Services/Interfaces
parent: Strip CR from http responses and limit them to 2048 chars (diff)
parent: HG: Added HEAD method to Helo service. This is the preferred method, but its ... (diff)
download: opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.zip
opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.gz
opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.bz2
opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs
index 220caef..e86ec51 100644
--- a/OpenSim/Services/Interfaces/IHypergridServices.cs
+++ b/OpenSim/Services/Interfaces/IHypergridServices.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Services.Interfaces
        List<UUID> StatusNotification(List<string> friends, UUID userID, bool online);
        //List<UUID> GetOnlineFriends(UUID userID, List<string> friends);
-        bool AgentIsComingHome(UUID sessionID, string thisGridExternalName);
+        bool IsAgentComingHome(UUID sessionID, string thisGridExternalName);
        bool VerifyAgent(UUID sessionID, string token);
        bool VerifyClient(UUID sessionID, string reportedIP);
    }
author	Melanie	2011-12-05 17:10:51 +0000
committer	Melanie	2011-12-05 17:10:51 +0000
commit	5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc (patch)
tree	537b010672277073530cf013434fa046aabfec7e /OpenSim/Services/Interfaces
parent	Strip CR from http responses and limit them to 2048 chars (diff)
parent	HG: Added HEAD method to Helo service. This is the preferred method, but its ... (diff)
download	opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.zip opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.gz opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.bz2 opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.xz

diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs index 220caef..e86ec51 100644 --- a/OpenSim/Services/Interfaces/IHypergridServices.cs +++ b/OpenSim/Services/Interfaces/IHypergridServices.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Services.Interfaces
65	List<UUID> StatusNotification(List<string> friends, UUID userID, bool online);	65	List<UUID> StatusNotification(List<string> friends, UUID userID, bool online);
66	//List<UUID> GetOnlineFriends(UUID userID, List<string> friends);	66	//List<UUID> GetOnlineFriends(UUID userID, List<string> friends);
67		67
68	bool AgentIsComingHome(UUID sessionID, string thisGridExternalName);	68	bool IsAgentComingHome(UUID sessionID, string thisGridExternalName);
69	bool VerifyAgent(UUID sessionID, string token);	69	bool VerifyAgent(UUID sessionID, string token);
70	bool VerifyClient(UUID sessionID, string reportedIP);	70	bool VerifyClient(UUID sessionID, string reportedIP);
71	}	71	}