diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Framework/Console/ConsoleBase.cs | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'OpenSim/Framework/Console/ConsoleBase.cs')
| -rwxr-xr-x | OpenSim/Framework/Console/ConsoleBase.cs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index 4b375d9..2d8e723 100755 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs | |||
| @@ -43,15 +43,7 @@ namespace OpenSim.Framework.Console | |||
| 43 | 43 | ||
| 44 | public object ConsoleScene { get; set; } | 44 | public object ConsoleScene { get; set; } |
| 45 | 45 | ||
| 46 | /// <summary> | 46 | public string DefaultPrompt { get; set; } |
| 47 | /// The default prompt text. | ||
| 48 | /// </summary> | ||
| 49 | public string DefaultPrompt | ||
| 50 | { | ||
| 51 | set { m_defaultPrompt = value; } | ||
| 52 | get { return m_defaultPrompt; } | ||
| 53 | } | ||
| 54 | protected string m_defaultPrompt; | ||
| 55 | 47 | ||
| 56 | public ConsoleBase(string defaultPrompt) | 48 | public ConsoleBase(string defaultPrompt) |
| 57 | { | 49 | { |