aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2010-06-08 15:52:56 -0700
committerDiva Canto2010-06-08 15:52:56 -0700
commit0520b629558ac896698807e97e2185c5a7b7a186 (patch)
tree1565bbe76f1eb9ae7a9fb997231339ad5b55209f /OpenSim/Server
parentChanged XInventoryData's CreatorID to a string. (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-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')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs5
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)