diff options
| author | Teravus Ovares (Dan Olivares) | 2009-11-26 17:03:19 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-11-26 17:03:19 -0500 |
| commit | f84da8e642adb7fdfc516f47aa3b0b0a8c4ba576 (patch) | |
| tree | 8b0b1fcac25c93f65c628e04b4dd767193d25cc1 /OpenSim/Framework/ISceneObject.cs | |
| parent | * Fixes a case of d.BodyEnable with IntPtr.Zero passed as the parameter in li... (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f84da8e642adb7fdfc516f47aa3b0b0a8c4ba576.zip opensim-SC_OLD-f84da8e642adb7fdfc516f47aa3b0b0a8c4ba576.tar.gz opensim-SC_OLD-f84da8e642adb7fdfc516f47aa3b0b0a8c4ba576.tar.bz2 opensim-SC_OLD-f84da8e642adb7fdfc516f47aa3b0b0a8c4ba576.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/ISceneObject.cs')
| -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 | } |