diff options
| author | Melanie | 2012-11-25 14:14:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-25 14:14:20 +0000 |
| commit | cf670c01cc1860d5cb4f0f5f8b27694bbcd6ac23 (patch) | |
| tree | 7a2128583d33d0f74a7393b5b66c6a00801922fa /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'teravuswork' of careminster:/var/git/careminster into teravuswork (diff) | |
| download | opensim-SC_OLD-cf670c01cc1860d5cb4f0f5f8b27694bbcd6ac23.zip opensim-SC_OLD-cf670c01cc1860d5cb4f0f5f8b27694bbcd6ac23.tar.gz opensim-SC_OLD-cf670c01cc1860d5cb4f0f5f8b27694bbcd6ac23.tar.bz2 opensim-SC_OLD-cf670c01cc1860d5cb4f0f5f8b27694bbcd6ac23.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs index 4e84364..026ceca 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs | |||
| @@ -107,7 +107,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends | |||
| 107 | m_scene.AddCommand( | 107 | m_scene.AddCommand( |
| 108 | "Friends", this, "friends show", | 108 | "Friends", this, "friends show", |
| 109 | "friends show [--cache] <first-name> <last-name>", | 109 | "friends show [--cache] <first-name> <last-name>", |
| 110 | "Show the friends for the given user if they exist.\n", | 110 | "Show the friends for the given user if they exist.", |
| 111 | "The --cache option will show locally cached information for that user.", | 111 | "The --cache option will show locally cached information for that user.", |
| 112 | HandleFriendsShowCommand); | 112 | HandleFriendsShowCommand); |
| 113 | } | 113 | } |
| @@ -197,4 +197,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends | |||
| 197 | } | 197 | } |
| 198 | } | 198 | } |
| 199 | } | 199 | } |
| 200 | } \ No newline at end of file | 200 | } |