aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Friends
diff options
context:
space:
mode:
authorUbitUmarov2019-10-22 13:04:01 +0100
committerUbitUmarov2019-10-22 13:04:01 +0100
commit46e36601cb3c54e6e441284aed7c0c5c35970a4c (patch)
treebf52486c1e8edaae327d7d93ea3ae6e6fd48a61d /OpenSim/Region/OptionalModules/Avatar/Friends
parentremove some more useless NULL arguments (diff)
downloadopensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.zip
opensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.tar.gz
opensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.tar.bz2
opensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.tar.xz
remove some more useless NULL arguments
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Friends')
-rwxr-xr-xOpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
index 030c9eb..a913ec4 100755
--- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
136 136
137 if (userId == UUID.Zero) 137 if (userId == UUID.Zero)
138 { 138 {
139 MainConsole.Instance.Output("No such user as {0} {1}", null, firstName, lastName); 139 MainConsole.Instance.Output("No such user as {0} {1}", firstName, lastName);
140 return; 140 return;
141 } 141 }
142 142
@@ -146,7 +146,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
146 { 146 {
147 if (!m_friendsModule.AreFriendsCached(userId)) 147 if (!m_friendsModule.AreFriendsCached(userId))
148 { 148 {
149 MainConsole.Instance.Output("No friends cached on this simulator for {0} {1}", null, firstName, lastName); 149 MainConsole.Instance.Output("No friends cached on this simulator for {0} {1}", firstName, lastName);
150 return; 150 return;
151 } 151 }
152 else 152 else
@@ -162,10 +162,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
162 friends = ((FriendsModule)m_friendsModule).FriendsService.GetFriends(userId); 162 friends = ((FriendsModule)m_friendsModule).FriendsService.GetFriends(userId);
163 } 163 }
164 164
165 MainConsole.Instance.Output("Friends for {0} {1} {2}:", null, firstName, lastName, userId); 165 MainConsole.Instance.Output("Friends for {0} {1} {2}:", firstName, lastName, userId);
166 166
167 MainConsole.Instance.Output( 167 MainConsole.Instance.Output(
168 "{0,-36} {1,-36} {2,-7} {3,7} {4,10}", null, "UUID", "Name", "Status", "MyFlags", "TheirFlags"); 168 "{0,-36} {1,-36} {2,-7} {3,7} {4,10}", "UUID", "Name", "Status", "MyFlags", "TheirFlags");
169 169
170 foreach (FriendInfo friend in friends) 170 foreach (FriendInfo friend in friends)
171 { 171 {
@@ -193,7 +193,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
193 193
194 MainConsole.Instance.Output( 194 MainConsole.Instance.Output(
195 "{0,-36} {1,-36} {2,-7} {3,-7} {4,-10}", 195 "{0,-36} {1,-36} {2,-7} {3,-7} {4,-10}",
196 null,
197 friend.Friend, friendName, onlineText, friend.MyFlags, friend.TheirFlags); 196 friend.Friend, friendName, onlineText, friend.MyFlags, friend.TheirFlags);
198 } 197 }
199 } 198 }