diff options
author | UbitUmarov | 2017-05-14 01:44:04 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-14 01:44:04 +0100 |
commit | cb21caae777341b7b4af724e86b9a82b9b827c43 (patch) | |
tree | d4eb86f9ba6fc1fd1c35015a335e7a1a55fa0ad1 /OpenSim/Framework/LandData.cs | |
parent | find parcels by GlobalID.. well most time (diff) | |
download | opensim-SC_OLD-cb21caae777341b7b4af724e86b9a82b9b827c43.zip opensim-SC_OLD-cb21caae777341b7b4af724e86b9a82b9b827c43.tar.gz opensim-SC_OLD-cb21caae777341b7b4af724e86b9a82b9b827c43.tar.bz2 opensim-SC_OLD-cb21caae777341b7b4af724e86b9a82b9b827c43.tar.xz |
fix some issue on parcels loading and make parcels dwell show something. Resolution is 2.5min aprox.
Diffstat (limited to 'OpenSim/Framework/LandData.cs')
-rw-r--r-- | OpenSim/Framework/LandData.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 13d2977..13b58be 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -97,7 +97,9 @@ namespace OpenSim.Framework | |||
97 | private bool _mediaLoop = false; | 97 | private bool _mediaLoop = false; |
98 | private bool _obscureMusic = false; | 98 | private bool _obscureMusic = false; |
99 | private bool _obscureMedia = false; | 99 | private bool _obscureMedia = false; |
100 | private float _dwell = 0; | 100 | |
101 | private float m_dwell = 0; | ||
102 | public double LastDwellTimeMS; | ||
101 | 103 | ||
102 | public bool SeeAVs { get; set; } | 104 | public bool SeeAVs { get; set; } |
103 | public bool AnyAVSounds { get; set; } | 105 | public bool AnyAVSounds { get; set; } |
@@ -111,11 +113,12 @@ namespace OpenSim.Framework | |||
111 | { | 113 | { |
112 | get | 114 | get |
113 | { | 115 | { |
114 | return _dwell; | 116 | return m_dwell; |
115 | } | 117 | } |
116 | set | 118 | set |
117 | { | 119 | { |
118 | _dwell = value; | 120 | m_dwell = value; |
121 | LastDwellTimeMS = Util.GetTimeStampMS(); | ||
119 | } | 122 | } |
120 | } | 123 | } |
121 | 124 | ||
@@ -735,6 +738,7 @@ namespace OpenSim.Framework | |||
735 | SeeAVs = true; | 738 | SeeAVs = true; |
736 | AnyAVSounds = true; | 739 | AnyAVSounds = true; |
737 | GroupAVSounds = true; | 740 | GroupAVSounds = true; |
741 | LastDwellTimeMS = Util.GetTimeStampMS(); | ||
738 | } | 742 | } |
739 | 743 | ||
740 | /// <summary> | 744 | /// <summary> |
@@ -784,7 +788,7 @@ namespace OpenSim.Framework | |||
784 | landData._obscureMedia = _obscureMedia; | 788 | landData._obscureMedia = _obscureMedia; |
785 | landData._simwideArea = _simwideArea; | 789 | landData._simwideArea = _simwideArea; |
786 | landData._simwidePrims = _simwidePrims; | 790 | landData._simwidePrims = _simwidePrims; |
787 | landData._dwell = _dwell; | 791 | landData.m_dwell = m_dwell; |
788 | landData.SeeAVs = SeeAVs; | 792 | landData.SeeAVs = SeeAVs; |
789 | landData.AnyAVSounds = AnyAVSounds; | 793 | landData.AnyAVSounds = AnyAVSounds; |
790 | landData.GroupAVSounds = GroupAVSounds; | 794 | landData.GroupAVSounds = GroupAVSounds; |