aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2017-05-14 01:44:04 +0100
committerUbitUmarov2017-05-14 01:44:04 +0100
commitcb21caae777341b7b4af724e86b9a82b9b827c43 (patch)
treed4eb86f9ba6fc1fd1c35015a335e7a1a55fa0ad1 /OpenSim/Region/Framework
parentfind parcels by GlobalID.. well most time (diff)
downloadopensim-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/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IDwellModule.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IDwellModule.cs b/OpenSim/Region/Framework/Interfaces/IDwellModule.cs
index db50439..ebef5a4 100644
--- a/OpenSim/Region/Framework/Interfaces/IDwellModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDwellModule.cs
@@ -33,5 +33,6 @@ namespace OpenSim.Region.Framework.Interfaces
33 public interface IDwellModule 33 public interface IDwellModule
34 { 34 {
35 int GetDwell(UUID parcelID); 35 int GetDwell(UUID parcelID);
36 int GetDwell(LandData land);
36 } 37 }
37} 38}
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6d4cb52..805c9ad 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -170,6 +170,7 @@ namespace OpenSim.Region.Framework.Scenes
170 private bool m_previusParcelHide = false; 170 private bool m_previusParcelHide = false;
171 private bool m_currentParcelHide = false; 171 private bool m_currentParcelHide = false;
172 private object parcelLock = new Object(); 172 private object parcelLock = new Object();
173 public double ParcelDwellTickMS;
173 174
174 public UUID currentParcelUUID 175 public UUID currentParcelUUID
175 { 176 {
@@ -182,6 +183,7 @@ namespace OpenSim.Region.Framework.Scenes
182 bool checksame = true; 183 bool checksame = true;
183 if (value != m_currentParcelUUID) 184 if (value != m_currentParcelUUID)
184 { 185 {
186 ParcelDwellTickMS = Util.GetTimeStampMS();
185 m_previusParcelHide = m_currentParcelHide; 187 m_previusParcelHide = m_currentParcelHide;
186 m_previusParcelUUID = m_currentParcelUUID; 188 m_previusParcelUUID = m_currentParcelUUID;
187 checksame = false; 189 checksame = false;
@@ -2141,6 +2143,7 @@ namespace OpenSim.Region.Framework.Scenes
2141 m_previusParcelUUID = UUID.Zero; 2143 m_previusParcelUUID = UUID.Zero;
2142 m_currentParcelHide = false; 2144 m_currentParcelHide = false;
2143 m_currentParcelUUID = UUID.Zero; 2145 m_currentParcelUUID = UUID.Zero;
2146 ParcelDwellTickMS = Util.GetTimeStampMS();
2144 2147
2145 if(!IsNPC) 2148 if(!IsNPC)
2146 { 2149 {