aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorHomer Horwitz2009-01-05 21:45:20 +0000
committerHomer Horwitz2009-01-05 21:45:20 +0000
commit0c3426935e159bffa0cc10cbf9e38e9f385d09d0 (patch)
treeacb28b6e6c252dd12f190928a6b1fa9a2ac19cb1 /OpenSim
parent* minor: remove some mono compiler warnings (diff)
downloadopensim-SC_OLD-0c3426935e159bffa0cc10cbf9e38e9f385d09d0.zip
opensim-SC_OLD-0c3426935e159bffa0cc10cbf9e38e9f385d09d0.tar.gz
opensim-SC_OLD-0c3426935e159bffa0cc10cbf9e38e9f385d09d0.tar.bz2
opensim-SC_OLD-0c3426935e159bffa0cc10cbf9e38e9f385d09d0.tar.xz
Use correct name for friendship offer. Fixes Mantis #2959.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index a1f0bf5..3490b6f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -431,6 +431,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
431 431
432 // some properties are misused here: 432 // some properties are misused here:
433 // fromAgentName is the *destination* name (the friend we offer friendship to) 433 // fromAgentName is the *destination* name (the friend we offer friendship to)
434 ScenePresence initiator = GetAnyPresenceFromAgentID(new UUID(im.fromAgentID));
435 im.fromAgentName = initiator != null ? initiator.Name : "(hippo)";
434 436
435 m_log.DebugFormat("[FRIEND]: Offer(38) - From: {0}, FromName: {1} To: {2}, Session: {3}, Message: {4}, Offline {5}", 437 m_log.DebugFormat("[FRIEND]: Offer(38) - From: {0}, FromName: {1} To: {2}, Session: {3}, Message: {4}, Offline {5}",
436 im.fromAgentID, im.fromAgentName, im.toAgentID, im.imSessionID, im.message, im.offline); 438 im.fromAgentID, im.fromAgentName, im.toAgentID, im.imSessionID, im.message, im.offline);