diff options
author | Melanie Thielker | 2009-05-12 14:59:11 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-12 14:59:11 +0000 |
commit | 1b7d0a6c93eb4a056d39b9cc708283086f8e8bf8 (patch) | |
tree | def2701b4586ed0f922214f4ff36265b4d20062d | |
parent | fixing SocketException when IP address cannot be resolved (diff) | |
download | opensim-SC-1b7d0a6c93eb4a056d39b9cc708283086f8e8bf8.zip opensim-SC-1b7d0a6c93eb4a056d39b9cc708283086f8e8bf8.tar.gz opensim-SC-1b7d0a6c93eb4a056d39b9cc708283086f8e8bf8.tar.bz2 opensim-SC-1b7d0a6c93eb4a056d39b9cc708283086f8e8bf8.tar.xz |
Paving the way for syncing group permissions across a grid
9 files changed, 26 insertions, 1 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index e5f7474..1cbf911 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -1622,6 +1622,10 @@ namespace OpenSim.Client.MXP.ClientStack | |||
1622 | { | 1622 | { |
1623 | } | 1623 | } |
1624 | 1624 | ||
1625 | public void RefreshGroupMembership() | ||
1626 | { | ||
1627 | } | ||
1628 | |||
1625 | public void SendUseCachedMuteList() | 1629 | public void SendUseCachedMuteList() |
1626 | { | 1630 | { |
1627 | } | 1631 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index 4c54f33..167d081 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
@@ -1077,6 +1077,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
1077 | throw new System.NotImplementedException(); | 1077 | throw new System.NotImplementedException(); |
1078 | } | 1078 | } |
1079 | 1079 | ||
1080 | public void RefreshGroupMembership() | ||
1081 | { | ||
1082 | throw new System.NotImplementedException(); | ||
1083 | } | ||
1084 | |||
1080 | public void SendAvatarNotesReply(UUID targetID, string text) | 1085 | public void SendAvatarNotesReply(UUID targetID, string text) |
1081 | { | 1086 | { |
1082 | throw new System.NotImplementedException(); | 1087 | throw new System.NotImplementedException(); |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 28d5502..9b137b7 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1141,6 +1141,7 @@ namespace OpenSim.Framework | |||
1141 | void SendClassifiedInfoReply(UUID classifiedID, UUID creatorID, uint creationDate, uint expirationDate, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, string simName, Vector3 globalPos, string parcelName, byte classifiedFlags, int price); | 1141 | void SendClassifiedInfoReply(UUID classifiedID, UUID creatorID, uint creationDate, uint expirationDate, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, string simName, Vector3 globalPos, string parcelName, byte classifiedFlags, int price); |
1142 | 1142 | ||
1143 | void SendAgentDropGroup(UUID groupID); | 1143 | void SendAgentDropGroup(UUID groupID); |
1144 | void RefreshGroupMembership(); | ||
1144 | void SendAvatarNotesReply(UUID targetID, string text); | 1145 | void SendAvatarNotesReply(UUID targetID, string text); |
1145 | void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks); | 1146 | void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks); |
1146 | void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled); | 1147 | void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled); |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index a157df5..72cb5c8 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -10512,7 +10512,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10512 | 10512 | ||
10513 | #endregion | 10513 | #endregion |
10514 | 10514 | ||
10515 | private void RefreshGroupMembership() | 10515 | public void RefreshGroupMembership() |
10516 | { | 10516 | { |
10517 | if (m_GroupsModule != null) | 10517 | if (m_GroupsModule != null) |
10518 | { | 10518 | { |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index ddb27fe..3e9195e 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -1074,6 +1074,10 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
1074 | { | 1074 | { |
1075 | } | 1075 | } |
1076 | 1076 | ||
1077 | public void RefreshGroupMembership() | ||
1078 | { | ||
1079 | } | ||
1080 | |||
1077 | public void SendUseCachedMuteList() | 1081 | public void SendUseCachedMuteList() |
1078 | { | 1082 | { |
1079 | } | 1083 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs index 6935924..8183828 100644 --- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs | |||
@@ -32,10 +32,12 @@ using OpenSim.Framework; | |||
32 | namespace OpenSim.Region.Framework.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public delegate void NewGroupNotice(UUID groupID, UUID noticeID); | 34 | public delegate void NewGroupNotice(UUID groupID, UUID noticeID); |
35 | public delegate void GroupChange(UUID groupID); | ||
35 | 36 | ||
36 | public interface IGroupsModule | 37 | public interface IGroupsModule |
37 | { | 38 | { |
38 | event NewGroupNotice OnNewGroupNotice; | 39 | event NewGroupNotice OnNewGroupNotice; |
40 | event GroupChange OnGroupChange; | ||
39 | 41 | ||
40 | void ActivateGroup(IClientAPI remoteClient, UUID groupID); | 42 | void ActivateGroup(IClientAPI remoteClient, UUID groupID); |
41 | List<GroupTitlesData> GroupTitlesRequest(IClientAPI remoteClient, UUID groupID); | 43 | List<GroupTitlesData> GroupTitlesRequest(IClientAPI remoteClient, UUID groupID); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs index 3476cdb..2a3df8c 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs | |||
@@ -541,6 +541,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
541 | #region IGroupsModule Members | 541 | #region IGroupsModule Members |
542 | 542 | ||
543 | public event NewGroupNotice OnNewGroupNotice; | 543 | public event NewGroupNotice OnNewGroupNotice; |
544 | public event GroupChange OnGroupChange; | ||
544 | 545 | ||
545 | public GroupRecord GetGroupRecord(UUID GroupID) | 546 | public GroupRecord GetGroupRecord(UUID GroupID) |
546 | { | 547 | { |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index d3be827..f529c9e 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -1074,6 +1074,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
1074 | { | 1074 | { |
1075 | } | 1075 | } |
1076 | 1076 | ||
1077 | public void RefreshGroupMembership() | ||
1078 | { | ||
1079 | } | ||
1080 | |||
1077 | public void SendUseCachedMuteList() | 1081 | public void SendUseCachedMuteList() |
1078 | { | 1082 | { |
1079 | } | 1083 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 256d6fd..f607284 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -1116,6 +1116,10 @@ namespace OpenSim.Tests.Common.Mock | |||
1116 | { | 1116 | { |
1117 | } | 1117 | } |
1118 | 1118 | ||
1119 | public void RefreshGroupMembership() | ||
1120 | { | ||
1121 | } | ||
1122 | |||
1119 | public void SendUseCachedMuteList() | 1123 | public void SendUseCachedMuteList() |
1120 | { | 1124 | { |
1121 | } | 1125 | } |