aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-11-14 20:33:39 +0000
committerMelanie2011-11-14 20:33:39 +0000
commit17f32b77736a369a309819678fc00ecff8ce875b (patch)
tree7ccfb3cf474e8b9fa78586b1fb45adc4935380e4 /OpenSim
parentMerge branch 'master' into bigmerge (diff)
downloadopensim-SC-17f32b77736a369a309819678fc00ecff8ce875b.zip
opensim-SC-17f32b77736a369a309819678fc00ecff8ce875b.tar.gz
opensim-SC-17f32b77736a369a309819678fc00ecff8ce875b.tar.bz2
opensim-SC-17f32b77736a369a309819678fc00ecff8ce875b.tar.xz
Fix build break
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 74f32e7..8e5de7d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -357,7 +357,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
357 im.offline = 0; 357 im.offline = 0;
358 im.fromAgentID = fromAgentID.Guid; 358 im.fromAgentID = fromAgentID.Guid;
359 im.fromAgentName = firstname + " " + lastname; 359 im.fromAgentName = firstname + " " + lastname;
360 im.offline = (byte)((presence == null) ? 1 : 0);
361 im.imSessionID = im.fromAgentID; 360 im.imSessionID = im.fromAgentID;
362 im.message = FriendshipMessage(fid); 361 im.message = FriendshipMessage(fid);
363 362
@@ -583,7 +582,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
583 ICallingCardModule ccm = client.Scene.RequestModuleInterface<ICallingCardModule>(); 582 ICallingCardModule ccm = client.Scene.RequestModuleInterface<ICallingCardModule>();
584 if (ccm != null) 583 if (ccm != null)
585 { 584 {
586 ccm.CreateCallingCard(agentID, friendID, UUID.Zero); 585 ccm.CreateCallingCard(client.AgentId, friendID, UUID.Zero);
587 } 586 }
588 587
589 // Update the local cache 588 // Update the local cache