ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
UbitUmarov
2017-01-05 19:32:57 +00:00
parent 9d28fd41c6 b16abc8166
commit 254b26a7d5
960 changed files with 23754 additions and 23741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
View File

@@ -101,7 +101,7 @@ namespace OpenSim.Region.DataSnapshot
public void Initialise(IConfigSource config)
{
if (!m_configLoaded)
if (!m_configLoaded)
{
m_configLoaded = true;
//m_log.Debug("[DATASNAPSHOT]: Loading configuration");
@@ -248,7 +248,7 @@ namespace OpenSim.Region.DataSnapshot
m_snapStore.ForceSceneStale(scene);
}
public void Close()
public void Close()
{
if (!m_enabled)
return;

2
OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
View File

@@ -143,7 +143,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
LandData parcel = land.LandData;
if (m_parent.ExposureLevel.Equals("all") ||
(m_parent.ExposureLevel.Equals("minimum") &&
(m_parent.ExposureLevel.Equals("minimum") &&
(parcel.Flags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory))
{