diff options
author | Justin Clark-Casey (justincc) | 2012-03-30 02:00:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-30 02:00:01 +0100 |
commit | 269e479cdc25c5420b4feaaebc233933323f93e2 (patch) | |
tree | 6bec165f4774f3eebfa54b67b4940f060df63b7c /OpenSim/Region/OptionalModules | |
parent | Make default "show friends" console command show friends fetched from the fri... (diff) | |
download | opensim-SC-269e479cdc25c5420b4feaaebc233933323f93e2.zip opensim-SC-269e479cdc25c5420b4feaaebc233933323f93e2.tar.gz opensim-SC-269e479cdc25c5420b4feaaebc233933323f93e2.tar.bz2 opensim-SC-269e479cdc25c5420b4feaaebc233933323f93e2.tar.xz |
minor: remove some now unneeded code from FriendsCommandsModule
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs index fe73770..e68f9d0 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs | |||
@@ -111,61 +111,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends | |||
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||
114 | protected void HandleFriendsShowCacheCommand(string module, string[] cmd) | ||
115 | { | ||
116 | if (cmd.Length != 5) | ||
117 | { | ||
118 | MainConsole.Instance.OutputFormat("Usage: friends show cache [<first-name> <last-name>]"); | ||
119 | return; | ||
120 | } | ||
121 | |||
122 | string firstName = cmd[3]; | ||
123 | string lastName = cmd[4]; | ||
124 | |||
125 | UUID userId = m_userManagementModule.GetUserIdByName(firstName, lastName); | ||
126 | |||
127 | // UserAccount ua | ||
128 | // = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, firstName, lastName); | ||
129 | |||
130 | if (userId == UUID.Zero) | ||
131 | { | ||
132 | MainConsole.Instance.OutputFormat("No such user as {0} {1}", firstName, lastName); | ||
133 | return; | ||
134 | } | ||
135 | |||
136 | if (m_friendsModule.AreFriendsCached(userId)) | ||
137 | { | ||
138 | MainConsole.Instance.OutputFormat("No friends cached on this simulator for {0} {1}", firstName, lastName); | ||
139 | return; | ||
140 | } | ||
141 | |||
142 | MainConsole.Instance.OutputFormat("Cached friends for {0} {1}:", firstName, lastName); | ||
143 | |||
144 | MainConsole.Instance.OutputFormat("UUID\n"); | ||
145 | |||
146 | FriendInfo[] friends = m_friendsModule.GetFriendsFromCache(userId); | ||
147 | |||
148 | foreach (FriendInfo friend in friends) | ||
149 | { | ||
150 | // MainConsole.Instance.OutputFormat(friend.PrincipalID.ToString()); | ||
151 | |||
152 | // string friendFirstName, friendLastName; | ||
153 | // | ||
154 | // UserAccount friendUa | ||
155 | // = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friend.PrincipalID); | ||
156 | |||
157 | UUID friendId; | ||
158 | string friendName; | ||
159 | |||
160 | if (UUID.TryParse(friend.Friend, out friendId)) | ||
161 | friendName = m_userManagementModule.GetUserName(friendId); | ||
162 | else | ||
163 | friendName = friend.Friend; | ||
164 | |||
165 | MainConsole.Instance.OutputFormat("{0} {1} {2}", friendName, friend.MyFlags, friend.TheirFlags); | ||
166 | } | ||
167 | } | ||
168 | |||
169 | protected void HandleFriendsShowCommand(string module, string[] cmd) | 114 | protected void HandleFriendsShowCommand(string module, string[] cmd) |
170 | { | 115 | { |
171 | Dictionary<string, object> options = new Dictionary<string, object>(); | 116 | Dictionary<string, object> options = new Dictionary<string, object>(); |