diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IGroupsModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs index 4c501f6..6885327 100644 --- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs | |||
@@ -93,7 +93,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
93 | void JoinGroupRequest(IClientAPI remoteClient, UUID GroupID); | 93 | void JoinGroupRequest(IClientAPI remoteClient, UUID GroupID); |
94 | void LeaveGroupRequest(IClientAPI remoteClient, UUID GroupID); | 94 | void LeaveGroupRequest(IClientAPI remoteClient, UUID GroupID); |
95 | void EjectGroupMemberRequest(IClientAPI remoteClient, UUID GroupID, UUID EjecteeID); | 95 | void EjectGroupMemberRequest(IClientAPI remoteClient, UUID GroupID, UUID EjecteeID); |
96 | void EjectGroupMember(IClientAPI remoteClient, UUID agentID, UUID GroupID, UUID EjecteeID); | ||
96 | void InviteGroupRequest(IClientAPI remoteClient, UUID GroupID, UUID InviteeID, UUID RoleID); | 97 | void InviteGroupRequest(IClientAPI remoteClient, UUID GroupID, UUID InviteeID, UUID RoleID); |
98 | void InviteGroup(IClientAPI remoteClient, UUID agentID, UUID GroupID, UUID InviteeID, UUID RoleID); | ||
97 | void NotifyChange(UUID GroupID); | 99 | void NotifyChange(UUID GroupID); |
98 | } | 100 | } |
99 | } \ No newline at end of file | 101 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c95c151..0b31e0c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1831,8 +1831,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1831 | 1831 | ||
1832 | foreach (SceneObjectGroup group in PrimsFromDB) | 1832 | foreach (SceneObjectGroup group in PrimsFromDB) |
1833 | { | 1833 | { |
1834 | EventManager.TriggerOnSceneObjectLoaded(group); | ||
1835 | AddRestoredSceneObject(group, true, true); | 1834 | AddRestoredSceneObject(group, true, true); |
1835 | EventManager.TriggerOnSceneObjectLoaded(group); | ||
1836 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); | 1836 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); |
1837 | rootPart.Flags &= ~PrimFlags.Scripted; | 1837 | rootPart.Flags &= ~PrimFlags.Scripted; |
1838 | rootPart.TrimPermissions(); | 1838 | rootPart.TrimPermissions(); |