diff options
| author | Melanie | 2009-08-07 03:05:46 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-07 03:05:46 +0100 |
| commit | e49abf446aff77fb809a0222ad0adaf4b37f3cf9 (patch) | |
| tree | 140251676b090bed41af22f87b804a6bd8bcf540 /OpenSim/Framework | |
| parent | Revert the XEngine memleak patch, it causes premature GC. (diff) | |
| parent | HGAuthenticationService must be a singleton, because it has in-memory state. ... (diff) | |
| download | opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.zip opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.gz opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.bz2 opensim-SC-e49abf446aff77fb809a0222ad0adaf4b37f3cf9.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/ISceneObject.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs index 14a338e..db19527 100644 --- a/OpenSim/Framework/ISceneObject.cs +++ b/OpenSim/Framework/ISceneObject.cs | |||
| @@ -34,6 +34,7 @@ namespace OpenSim.Framework | |||
| 34 | { | 34 | { |
| 35 | UUID UUID { get; } | 35 | UUID UUID { get; } |
| 36 | ISceneObject CloneForNewScene(); | 36 | ISceneObject CloneForNewScene(); |
| 37 | string ToXml2(); | ||
| 37 | string ExtraToXmlString(); | 38 | string ExtraToXmlString(); |
| 38 | void ExtraFromXmlString(string xmlstr); | 39 | void ExtraFromXmlString(string xmlstr); |
| 39 | string GetStateSnapshot(); | 40 | string GetStateSnapshot(); |