diff options
| author | Melanie | 2011-10-25 03:17:18 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:17:18 +0100 |
| commit | bfc0c96379e5cc61d919cdf88b1729f3d79002c5 (patch) | |
| tree | 374270c655d27e2081bee48f27d1dee709517067 /OpenSim/Region | |
| parent | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge (diff) | |
| parent | Removed redundant NotInTransit function from ScenePresence. IsInTransit=false... (diff) | |
| download | opensim-SC-bfc0c96379e5cc61d919cdf88b1729f3d79002c5.zip opensim-SC-bfc0c96379e5cc61d919cdf88b1729f3d79002c5.tar.gz opensim-SC-bfc0c96379e5cc61d919cdf88b1729f3d79002c5.tar.bz2 opensim-SC-bfc0c96379e5cc61d919cdf88b1729f3d79002c5.tar.xz | |
Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index fb25493..9970763 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3266,11 +3266,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3266 | } | 3266 | } |
| 3267 | } | 3267 | } |
| 3268 | 3268 | ||
| 3269 | public void NotInTransit() | ||
| 3270 | { | ||
| 3271 | IsInTransit = false; | ||
| 3272 | } | ||
| 3273 | |||
| 3274 | public void RestoreInCurrentScene() | 3269 | public void RestoreInCurrentScene() |
| 3275 | { | 3270 | { |
| 3276 | AddToPhysicalScene(false); // not exactly false | 3271 | AddToPhysicalScene(false); // not exactly false |