diff options
| author | Robert Adams | 2013-05-03 14:25:52 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-05-03 14:25:52 -0700 |
| commit | 1ffa69f691449fb240327505c94b18d4bf63c103 (patch) | |
| tree | d2c0c028badd4c491418845a56e9582c62dfacf2 /OpenSim/Framework | |
| parent | BulletSim: zero vehicle motion when changing vehicle type. (diff) | |
| parent | Fix possible race condition with local region cache if a region was added aft... (diff) | |
| download | opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.zip opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.tar.gz opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.tar.bz2 opensim-SC_OLD-1ffa69f691449fb240327505c94b18d4bf63c103.tar.xz | |
Merge branch 'master' into bulletsim4
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IScene.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 87ec99e..8164f41 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
| @@ -136,5 +136,10 @@ namespace OpenSim.Framework | |||
| 136 | ISceneObject DeserializeObject(string representation); | 136 | ISceneObject DeserializeObject(string representation); |
| 137 | 137 | ||
| 138 | bool CheckClient(UUID agentID, System.Net.IPEndPoint ep); | 138 | bool CheckClient(UUID agentID, System.Net.IPEndPoint ep); |
| 139 | |||
| 140 | /// <summary> | ||
| 141 | /// Start the scene and associated scripts within it. | ||
| 142 | /// </summary> | ||
| 143 | void Start(); | ||
| 139 | } | 144 | } |
| 140 | } | 145 | } \ No newline at end of file |