ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

some fixes on env protocol, forced env, etc

Browse Source
This commit is contained in:
UbitUmarov
2020-06-21 01:41:14 +01:00
parent 17e7e9b354
commit 5b56a09cb2
6 changed files with 70 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Framework/ViewerEnvironment.cs
View File

@@ -898,7 +898,7 @@ namespace OpenSim.Framework
public int DayOffset = 57600;
public int Flags = 0;
float[] Altitudes = new float[3] {1000f, 2000f, 3000f };
public float[] Altitudes = new float[3] {1000f, 2000f, 3000f };
//DayHash;
public bool IsLegacy = false;
@@ -1158,27 +1158,32 @@ namespace OpenSim.Framework
for(int i = 0; i < alt.Count && i < 3; ++i)
Altitudes[i] = alt[i];
for(int i = 0; i < 2; ++i)
{
float h = Altitudes[i];
for(int j = i + 1; j < 3; ++j)
{
if(h > Altitudes[j])
{
Altitudes[i] = Altitudes[j];
Altitudes[j] = h;
List<DayCycle.TrackEntry> tet = Cycle.skyTracks[i];
Cycle.skyTracks[i] = Cycle.skyTracks[j];
Cycle.skyTracks[j] = tet;
h = Altitudes[i];
}
}
}
SortAltitudes();
}
IsLegacy = false;
}
public void SortAltitudes()
{
for (int i = 0; i < 2; ++i)
{
float h = Altitudes[i];
for (int j = i + 1; j < 3; ++j)
{
if (h > Altitudes[j])
{
Altitudes[i] = Altitudes[j];
Altitudes[j] = h;
List<DayCycle.TrackEntry> tet = Cycle.skyTracks[i];
Cycle.skyTracks[i] = Cycle.skyTracks[j];
Cycle.skyTracks[j] = tet;
h = Altitudes[i];
}
}
}
}
public bool CycleFromOSD(OSD osd)
{
OSDMap map = osd as OSDMap;