diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Framework/Watchdog.cs
Diffstat (limited to 'OpenSim/Framework/Console/ConsoleBase.cs')
| -rwxr-xr-x | OpenSim/Framework/Console/ConsoleBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index c59fbca..4b375d9 100755 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs | |||
| @@ -41,7 +41,7 @@ namespace OpenSim.Framework.Console | |||
| 41 | 41 | ||
| 42 | protected string prompt = "# "; | 42 | protected string prompt = "# "; |
| 43 | 43 | ||
| 44 | public object ConsoleScene = null; | 44 | public object ConsoleScene { get; set; } |
| 45 | 45 | ||
| 46 | /// <summary> | 46 | /// <summary> |
| 47 | /// The default prompt text. | 47 | /// The default prompt text. |