diff options
| author | Melanie | 2012-07-28 00:39:36 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-28 00:39:36 +0100 |
| commit | 771d79e83e9ef5686aee5fe1c572673cff291083 (patch) | |
| tree | b37749fc1929ffd6dd1b9c2c4e29120accf26b99 /OpenSim/Region/Framework/Interfaces/IScenePresence.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | LSL/OSSL lacks Math.Min & Math.Max implementations. (diff) | |
| download | opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.zip opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.gz opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.bz2 opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IScenePresence.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IScenePresence.cs b/OpenSim/Region/Framework/Interfaces/IScenePresence.cs index 3f68ee0..0fe681f 100644 --- a/OpenSim/Region/Framework/Interfaces/IScenePresence.cs +++ b/OpenSim/Region/Framework/Interfaces/IScenePresence.cs | |||
| @@ -40,8 +40,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 40 | /// </remarks> | 40 | /// </remarks> |
| 41 | public interface IScenePresence : ISceneAgent | 41 | public interface IScenePresence : ISceneAgent |
| 42 | { | 42 | { |
| 43 | PresenceType PresenceType { get; } | ||
| 44 | |||
| 45 | /// <summary> | 43 | /// <summary> |
| 46 | /// Copy of the script states while the agent is in transit. This state may | 44 | /// Copy of the script states while the agent is in transit. This state may |
| 47 | /// need to be placed back in case of transfer fail. | 45 | /// need to be placed back in case of transfer fail. |