diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs')
-rwxr-xr-x[-rw-r--r--] | OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs index 31fc56a..030c9eb 100644..100755 --- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs | |||
@@ -122,7 +122,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends | |||
122 | 122 | ||
123 | if (mainParams.Count != 4) | 123 | if (mainParams.Count != 4) |
124 | { | 124 | { |
125 | MainConsole.Instance.OutputFormat("Usage: friends show [--cache] <first-name> <last-name>"); | 125 | MainConsole.Instance.Output("Usage: friends show [--cache] <first-name> <last-name>"); |
126 | return; | 126 | return; |
127 | } | 127 | } |
128 | 128 | ||
@@ -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.OutputFormat("No such user as {0} {1}", firstName, lastName); | 139 | MainConsole.Instance.Output("No such user as {0} {1}", null, 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.OutputFormat("No friends cached on this simulator for {0} {1}", firstName, lastName); | 149 | MainConsole.Instance.Output("No friends cached on this simulator for {0} {1}", null, 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.OutputFormat("Friends for {0} {1} {2}:", firstName, lastName, userId); | 165 | MainConsole.Instance.Output("Friends for {0} {1} {2}:", null, firstName, lastName, userId); |
166 | 166 | ||
167 | MainConsole.Instance.OutputFormat( | 167 | MainConsole.Instance.Output( |
168 | "{0,-36} {1,-36} {2,-7} {3,7} {4,10}", "UUID", "Name", "Status", "MyFlags", "TheirFlags"); | 168 | "{0,-36} {1,-36} {2,-7} {3,7} {4,10}", null, "UUID", "Name", "Status", "MyFlags", "TheirFlags"); |
169 | 169 | ||
170 | foreach (FriendInfo friend in friends) | 170 | foreach (FriendInfo friend in friends) |
171 | { | 171 | { |
@@ -191,8 +191,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends | |||
191 | else | 191 | else |
192 | onlineText = "offline"; | 192 | onlineText = "offline"; |
193 | 193 | ||
194 | MainConsole.Instance.OutputFormat( | 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, | ||
196 | friend.Friend, friendName, onlineText, friend.MyFlags, friend.TheirFlags); | 197 | friend.Friend, friendName, onlineText, friend.MyFlags, friend.TheirFlags); |
197 | } | 198 | } |
198 | } | 199 | } |