ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

create selected: avoid a first extra (wrong) packet on create

Browse Source
This commit is contained in:
UbitUmarov
2020-08-04 21:27:43 +01:00
parent 16dc3ee280
commit 726fc92a2b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -2553,7 +2553,12 @@ namespace OpenSim.Region.Framework.Scenes
// Otherwise, use this default creation code;
sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
sceneObject.SetGroup(groupID, null);
AddNewSceneObject(sceneObject, true);
if ((addFlags & (uint)PrimFlags.CreateSelected) != 0)
{
sceneObject.IsSelected = true;
sceneObject.RootPart.CreateSelected = true;
}
if (AgentPreferencesService != null) // This will override the brave new full perm world!
{
@@ -2566,16 +2571,13 @@ namespace OpenSim.Region.Framework.Scenes
sceneObject.RootPart.NextOwnerMask = (uint)prefs.PermNextOwner;
}
}
AddNewSceneObject(sceneObject, true, false);
}
if (UserManagementModule != null)
sceneObject.RootPart.CreatorIdentification = UserManagementModule.GetUserUUI(ownerID);
if((addFlags & (uint)PrimFlags.CreateSelected) != 0)
{
sceneObject.IsSelected = true;
sceneObject.RootPart.CreateSelected = true;
}
sceneObject.InvalidateDeepEffectivePerms();;
sceneObject.ScheduleGroupForFullAnimUpdate();
@@ -6128,7 +6130,7 @@ Environment.Exit(1);
// We may be called before there is a presence or a client.
// Fake AgentCircuitData to keep IAuthorizationModule smiling
if (client == null)
if (aCircuit == null)
{
aCircuit = new AgentCircuitData();
aCircuit.AgentID = agentID;