diff options
| author | Melanie | 2011-12-09 22:55:08 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-09 22:55:08 +0000 |
| commit | 5f6a4c4111b996cc8cea20b5d39d902db4aa4dba (patch) | |
| tree | a91059a30d7997c78ac267aeb33816bfd747c6c0 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Restore the Avination way of position and angle calculation so resizers (diff) | |
| parent | remove some unused fields in ScenePresence (diff) | |
| download | opensim-SC-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.zip opensim-SC-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.tar.gz opensim-SC-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.tar.bz2 opensim-SC-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 21e3d3f..e2c6a08 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -182,10 +182,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 182 | 182 | ||
| 183 | private const int LAND_VELOCITYMAG_MAX = 12; | 183 | private const int LAND_VELOCITYMAG_MAX = 12; |
| 184 | 184 | ||
| 185 | public bool IsRestrictedToRegion; | ||
| 186 | |||
| 187 | public string JID = String.Empty; | ||
| 188 | |||
| 189 | private float m_health = 100f; | 185 | private float m_health = 100f; |
| 190 | 186 | ||
| 191 | protected ulong crossingFromRegion; | 187 | protected ulong crossingFromRegion; |