ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

avoid a possible null ref

Browse Source
This commit is contained in:
UbitUmarov
2024-04-11 02:42:05 +01:00
parent bbac092621
commit c981f3c448
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/GodController.cs
View File

@@ -240,9 +240,8 @@ namespace OpenSim.Region.Framework.Scenes
if(state != null)
{
OSDMap s = (OSDMap)state;
if (s.ContainsKey("ViewerUiIsGod"))
newstate = s["ViewerUiIsGod"].AsBoolean();
if (s.TryGetValue("ViewerUiIsGod", out OSD tmp))
newstate = tmp.AsBoolean();
m_lastLevelToViewer = m_viewergodlevel; // we are not changing viewer level by default
}
UpdateGodLevels(newstate);

2
ThirdParty/SmartThreadPool/SmartThreadPool.cs vendored
View File

@@ -846,6 +846,8 @@ namespace Amib.Threading
continue;
Thread thread = te.WorkThread;
if(thread is null)
continue;
// Join don't work with negative numbers
if (!waitInfinitely && (millisecondsLeft < 0))