diff options
| author | Justin Clark-Casey (justincc) | 2009-11-26 19:02:41 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-26 19:02:41 +0000 |
| commit | 377bc27c1fdab6f45135194a53ba17cce1f3388f (patch) | |
| tree | 51e2bbc45c30dfceed0311452ad9b30532d7bd13 /OpenSim/Framework/ISceneObject.cs | |
| parent | Bump trunk version number to 0.6.9. (diff) | |
| parent | Fix a small bug. Trusted script crossings now work again (diff) | |
| download | opensim-SC-377bc27c1fdab6f45135194a53ba17cce1f3388f.zip opensim-SC-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.gz opensim-SC-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.bz2 opensim-SC-377bc27c1fdab6f45135194a53ba17cce1f3388f.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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 | } |