diff options
| author | Homer Horwitz | 2008-11-02 13:07:57 +0000 |
|---|---|---|
| committer | Homer Horwitz | 2008-11-02 13:07:57 +0000 |
| commit | 499f1428f707cbb116349dc0a2f07a19658df668 (patch) | |
| tree | 516cd76203c030773b0bc9bf3cd86e5581b09a46 /OpenSim/Region/Environment | |
| parent | Cause inventory to be fetched on scripted item gives if the destination (diff) | |
| download | opensim-SC-499f1428f707cbb116349dc0a2f07a19658df668.zip opensim-SC-499f1428f707cbb116349dc0a2f07a19658df668.tar.gz opensim-SC-499f1428f707cbb116349dc0a2f07a19658df668.tar.bz2 opensim-SC-499f1428f707cbb116349dc0a2f07a19658df668.tar.xz | |
- 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.
Diffstat (limited to 'OpenSim/Region/Environment')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
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 | |||
| 396 | 396 | ||
| 397 | UUID transactionID = UUID.Random(); | 397 | UUID transactionID = UUID.Random(); |
| 398 | 398 | ||
| 399 | // 1.20 protocol sends an UUID in the message field, instead of the friendship offer text. | ||
| 400 | // For interoperability, we have to clear that | ||
| 401 | if (Util.isUUID(message)) message = ""; | ||
| 402 | |||
| 399 | GridInstantMessage msg = new GridInstantMessage(); | 403 | GridInstantMessage msg = new GridInstantMessage(); |
| 400 | msg.fromAgentID = fromAgentID.Guid; | 404 | msg.fromAgentID = fromAgentID.Guid; |
| 401 | msg.fromAgentSession = UUID.Zero.Guid; // server IMs don't have a session | 405 | msg.fromAgentSession = UUID.Zero.Guid; // server IMs don't have a session |