Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge
commit
bfc0c96379
|
@ -3266,11 +3266,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void NotInTransit()
|
|
||||||
{
|
|
||||||
IsInTransit = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void RestoreInCurrentScene()
|
public void RestoreInCurrentScene()
|
||||||
{
|
{
|
||||||
AddToPhysicalScene(false); // not exactly false
|
AddToPhysicalScene(false); // not exactly false
|
||||||
|
|
Loading…
Reference in New Issue