diff options
| author | Melanie | 2009-11-26 17:27:03 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-26 17:27:03 +0000 |
| commit | 06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6 (patch) | |
| tree | 7c0a0a90235a988d69482a4c93dad6c8bbf6a5fc /OpenSim/Framework | |
| parent | Remove the old remoting-type interregion code for prim/script crossing (diff) | |
| parent | Fix a small bug. Trusted script crossings now work again (diff) | |
| download | opensim-SC_OLD-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.zip opensim-SC_OLD-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.gz opensim-SC_OLD-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.bz2 opensim-SC_OLD-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/ISceneObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs index 4fc3e01..5147901 100644 --- a/OpenSim/Framework/ISceneObject.cs +++ b/OpenSim/Framework/ISceneObject.cs | |||
| @@ -38,6 +38,6 @@ namespace OpenSim.Framework | |||
| 38 | string ExtraToXmlString(); | 38 | string ExtraToXmlString(); |
| 39 | void ExtraFromXmlString(string xmlstr); | 39 | void ExtraFromXmlString(string xmlstr); |
| 40 | string GetStateSnapshot(); | 40 | string GetStateSnapshot(); |
| 41 | void SetState(string xmlstr, UUID regionID); | 41 | void SetState(string xmlstr, IScene s); |
| 42 | } | 42 | } |
| 43 | } | 43 | } |