From 499f1428f707cbb116349dc0a2f07a19658df668 Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Sun, 2 Nov 2008 13:07:57 +0000
Subject: - Add Util.isUUID - Add tests for Util.isUUID - First part of the fix
 for protocol interoperability between viewer 1.20 and 1.21 for friend offers.

---
 OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs')

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 605b6a2..33ca632 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -396,6 +396,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
 
                     UUID transactionID = UUID.Random();
 
+                    // 1.20 protocol sends an UUID in the message field, instead of the friendship offer text.
+                    // For interoperability, we have to clear that
+                    if (Util.isUUID(message)) message = "";
+
                     GridInstantMessage msg = new GridInstantMessage();
                     msg.fromAgentID = fromAgentID.Guid;
                     msg.fromAgentSession = UUID.Zero.Guid; // server IMs don't have a session
-- 
cgit v1.1