diff options
| author | Diva Canto | 2010-06-08 15:52:56 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-08 15:52:56 -0700 |
| commit | 0520b629558ac896698807e97e2185c5a7b7a186 (patch) | |
| tree | 1565bbe76f1eb9ae7a9fb997231339ad5b55209f /OpenSim/Server/Base | |
| parent | Changed XInventoryData's CreatorID to a string. (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-0520b629558ac896698807e97e2185c5a7b7a186.zip opensim-SC_OLD-0520b629558ac896698807e97e2185c5a7b7a186.tar.gz opensim-SC_OLD-0520b629558ac896698807e97e2185c5a7b7a186.tar.bz2 opensim-SC_OLD-0520b629558ac896698807e97e2185c5a7b7a186.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server/Base')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 63ba673..a5bebb8 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
| @@ -236,6 +236,11 @@ namespace OpenSim.Server.Base | |||
| 236 | Initialise(); | 236 | Initialise(); |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | public bool Running | ||
| 240 | { | ||
| 241 | get { return m_Running; } | ||
| 242 | } | ||
| 243 | |||
| 239 | public virtual int Run() | 244 | public virtual int Run() |
| 240 | { | 245 | { |
| 241 | while (m_Running) | 246 | while (m_Running) |