diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
4 files changed, 97 insertions, 47 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index 87d067c..dfeecb1 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
@@ -95,7 +95,15 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
95 | "Show throttle settings for each client and for the server overall", | 95 | "Show throttle settings for each client and for the server overall", |
96 | "Without the 'full' option, only root agents are shown." | 96 | "Without the 'full' option, only root agents are shown." |
97 | + " With the 'full' option child agents are also shown.", | 97 | + " With the 'full' option child agents are also shown.", |
98 | ShowThrottlesReport); | 98 | ShowThrottlesReport); |
99 | |||
100 | scene.AddCommand( | ||
101 | this, "emergency-monitoring", | ||
102 | "Go on/off emergency monitoring mode", | ||
103 | "Go on/off emergency monitoring mode", | ||
104 | "Go on/off emergency monitoring mode", | ||
105 | EmergencyMonitoring); | ||
106 | |||
99 | } | 107 | } |
100 | 108 | ||
101 | public void RemoveRegion(Scene scene) | 109 | public void RemoveRegion(Scene scene) |
@@ -120,7 +128,25 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
120 | { | 128 | { |
121 | MainConsole.Instance.Output(GetThrottlesReport(cmd)); | 129 | MainConsole.Instance.Output(GetThrottlesReport(cmd)); |
122 | } | 130 | } |
123 | 131 | ||
132 | protected void EmergencyMonitoring(string module, string[] cmd) | ||
133 | { | ||
134 | bool mode = true; | ||
135 | if (cmd.Length == 1 || (cmd.Length > 1 && cmd[1] == "on")) | ||
136 | { | ||
137 | mode = true; | ||
138 | MainConsole.Instance.Output("Emergency Monitoring ON"); | ||
139 | } | ||
140 | else | ||
141 | { | ||
142 | mode = false; | ||
143 | MainConsole.Instance.Output("Emergency Monitoring OFF"); | ||
144 | } | ||
145 | |||
146 | foreach (Scene s in m_scenes.Values) | ||
147 | s.EmergencyMonitoring = mode; | ||
148 | } | ||
149 | |||
124 | protected string GetColumnEntry(string entry, int maxLength, int columnPadding) | 150 | protected string GetColumnEntry(string entry, int maxLength, int columnPadding) |
125 | { | 151 | { |
126 | return string.Format( | 152 | return string.Format( |
@@ -154,24 +180,26 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
154 | report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding)); | 180 | report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding)); |
155 | 181 | ||
156 | report.AppendFormat( | 182 | report.AppendFormat( |
157 | "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n", | 183 | "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}\n", |
158 | "Pkts", | 184 | "Pkts", |
159 | "Pkts", | 185 | "Pkts", |
186 | "Pkts", | ||
160 | "Bytes", | 187 | "Bytes", |
161 | "Pkts", | 188 | "Q Pkts", |
162 | "Pkts", | 189 | "Q Pkts", |
163 | "Pkts", | 190 | "Q Pkts", |
164 | "Pkts", | 191 | "Q Pkts", |
165 | "Pkts", | 192 | "Q Pkts", |
166 | "Pkts", | 193 | "Q Pkts", |
167 | "Pkts", | 194 | "Q Pkts", |
168 | "Pkts"); | 195 | "Q Pkts"); |
169 | 196 | ||
170 | report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); | 197 | report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); |
171 | report.AppendFormat( | 198 | report.AppendFormat( |
172 | "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n", | 199 | "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}\n", |
173 | "Out", | ||
174 | "In", | 200 | "In", |
201 | "Out", | ||
202 | "Resent", | ||
175 | "Unacked", | 203 | "Unacked", |
176 | "Resend", | 204 | "Resend", |
177 | "Land", | 205 | "Land", |
@@ -333,7 +361,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
333 | ThrottleRates throttleRates = udpServer.ThrottleRates; | 361 | ThrottleRates throttleRates = udpServer.ThrottleRates; |
334 | report.AppendFormat( | 362 | report.AppendFormat( |
335 | "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}", | 363 | "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}", |
336 | "n/a", | 364 | (throttleRates.Total * 8) / 1000, |
337 | (throttleRates.ResendLimit * 8) / 1000, | 365 | (throttleRates.ResendLimit * 8) / 1000, |
338 | (throttleRates.LandLimit * 8) / 1000, | 366 | (throttleRates.LandLimit * 8) / 1000, |
339 | (throttleRates.WindLimit * 8) / 1000, | 367 | (throttleRates.WindLimit * 8) / 1000, |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs index 5c779de..6d26075 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs | |||
@@ -63,7 +63,26 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
63 | void SetAgentActiveGroupRole(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID); | 63 | void SetAgentActiveGroupRole(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID); |
64 | void SetAgentGroupInfo(UUID RequestingAgentID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile); | 64 | void SetAgentGroupInfo(UUID RequestingAgentID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile); |
65 | 65 | ||
66 | /// <summary> | ||
67 | /// Get information about a specific group to which the user belongs. | ||
68 | /// </summary> | ||
69 | /// <param name="RequestingAgentID">The agent requesting the information.</param> | ||
70 | /// <param name="AgentID">The agent requested.</param> | ||
71 | /// <param name="GroupID">The group requested.</param> | ||
72 | /// <returns> | ||
73 | /// If the user is a member of the group then the data structure is returned. If not, then null is returned. | ||
74 | /// </returns> | ||
66 | GroupMembershipData GetAgentGroupMembership(UUID RequestingAgentID, UUID AgentID, UUID GroupID); | 75 | GroupMembershipData GetAgentGroupMembership(UUID RequestingAgentID, UUID AgentID, UUID GroupID); |
76 | |||
77 | /// <summary> | ||
78 | /// Get information about the groups to which a user belongs. | ||
79 | /// </summary> | ||
80 | /// <param name="RequestingAgentID">The agent requesting the information.</param> | ||
81 | /// <param name="AgentID">The agent requested.</param> | ||
82 | /// <returns> | ||
83 | /// Information about the groups to which the user belongs. If the user belongs to no groups then an empty | ||
84 | /// list is returned. | ||
85 | /// </returns> | ||
67 | List<GroupMembershipData> GetAgentGroupMemberships(UUID RequestingAgentID, UUID AgentID); | 86 | List<GroupMembershipData> GetAgentGroupMemberships(UUID RequestingAgentID, UUID AgentID); |
68 | 87 | ||
69 | void AddGroupNotice(UUID RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket); | 88 | void AddGroupNotice(UUID RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs index 0d265f2..81725c5 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs | |||
@@ -704,7 +704,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
704 | } | 704 | } |
705 | } | 705 | } |
706 | 706 | ||
707 | |||
708 | return findings; | 707 | return findings; |
709 | } | 708 | } |
710 | 709 | ||
@@ -712,54 +711,55 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
712 | { | 711 | { |
713 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 712 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
714 | 713 | ||
715 | GroupMembershipData data = new GroupMembershipData(); | 714 | GroupMembershipData data = null; |
716 | 715 | bool foundData = false; | |
717 | /////////////////////////////// | ||
718 | // Agent Specific Information: | ||
719 | // | ||
720 | OSDMap UserActiveGroup; | ||
721 | if (SimianGetGenericEntry(agentID, "Group", "ActiveGroup", out UserActiveGroup)) | ||
722 | { | ||
723 | data.Active = UserActiveGroup["GroupID"].AsUUID().Equals(groupID); | ||
724 | } | ||
725 | 716 | ||
726 | OSDMap UserGroupMemberInfo; | 717 | OSDMap UserGroupMemberInfo; |
727 | if (SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out UserGroupMemberInfo)) | 718 | if (SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out UserGroupMemberInfo)) |
728 | { | 719 | { |
720 | data = new GroupMembershipData(); | ||
729 | data.AcceptNotices = UserGroupMemberInfo["AcceptNotices"].AsBoolean(); | 721 | data.AcceptNotices = UserGroupMemberInfo["AcceptNotices"].AsBoolean(); |
730 | data.Contribution = UserGroupMemberInfo["Contribution"].AsInteger(); | 722 | data.Contribution = UserGroupMemberInfo["Contribution"].AsInteger(); |
731 | data.ListInProfile = UserGroupMemberInfo["ListInProfile"].AsBoolean(); | 723 | data.ListInProfile = UserGroupMemberInfo["ListInProfile"].AsBoolean(); |
732 | data.ActiveRole = UserGroupMemberInfo["SelectedRoleID"].AsUUID(); | 724 | data.ActiveRole = UserGroupMemberInfo["SelectedRoleID"].AsUUID(); |
725 | |||
726 | /////////////////////////////// | ||
727 | // Agent Specific Information: | ||
728 | // | ||
729 | OSDMap UserActiveGroup; | ||
730 | if (SimianGetGenericEntry(agentID, "Group", "ActiveGroup", out UserActiveGroup)) | ||
731 | { | ||
732 | data.Active = UserActiveGroup["GroupID"].AsUUID().Equals(groupID); | ||
733 | } | ||
733 | 734 | ||
734 | /////////////////////////////// | 735 | /////////////////////////////// |
735 | // Role Specific Information: | 736 | // Role Specific Information: |
736 | // | 737 | // |
737 | |||
738 | OSDMap GroupRoleInfo; | 738 | OSDMap GroupRoleInfo; |
739 | if (SimianGetGenericEntry(groupID, "GroupRole", data.ActiveRole.ToString(), out GroupRoleInfo)) | 739 | if (SimianGetGenericEntry(groupID, "GroupRole", data.ActiveRole.ToString(), out GroupRoleInfo)) |
740 | { | 740 | { |
741 | data.GroupTitle = GroupRoleInfo["Title"].AsString(); | 741 | data.GroupTitle = GroupRoleInfo["Title"].AsString(); |
742 | data.GroupPowers = GroupRoleInfo["Powers"].AsULong(); | 742 | data.GroupPowers = GroupRoleInfo["Powers"].AsULong(); |
743 | } | 743 | } |
744 | } | 744 | |
745 | 745 | /////////////////////////////// | |
746 | /////////////////////////////// | 746 | // Group Specific Information: |
747 | // Group Specific Information: | 747 | // |
748 | // | 748 | OSDMap GroupInfo; |
749 | OSDMap GroupInfo; | 749 | string GroupName; |
750 | string GroupName; | 750 | if (SimianGetFirstGenericEntry(groupID, "Group", out GroupName, out GroupInfo)) |
751 | if (SimianGetFirstGenericEntry(groupID, "Group", out GroupName, out GroupInfo)) | 751 | { |
752 | { | 752 | data.GroupID = groupID; |
753 | data.GroupID = groupID; | 753 | data.AllowPublish = GroupInfo["AllowPublish"].AsBoolean(); |
754 | data.AllowPublish = GroupInfo["AllowPublish"].AsBoolean(); | 754 | data.Charter = GroupInfo["Charter"].AsString(); |
755 | data.Charter = GroupInfo["Charter"].AsString(); | 755 | data.FounderID = GroupInfo["FounderID"].AsUUID(); |
756 | data.FounderID = GroupInfo["FounderID"].AsUUID(); | 756 | data.GroupName = GroupName; |
757 | data.GroupName = GroupName; | 757 | data.GroupPicture = GroupInfo["InsigniaID"].AsUUID(); |
758 | data.GroupPicture = GroupInfo["InsigniaID"].AsUUID(); | 758 | data.MaturePublish = GroupInfo["MaturePublish"].AsBoolean(); |
759 | data.MaturePublish = GroupInfo["MaturePublish"].AsBoolean(); | 759 | data.MembershipFee = GroupInfo["MembershipFee"].AsInteger(); |
760 | data.MembershipFee = GroupInfo["MembershipFee"].AsInteger(); | 760 | data.OpenEnrollment = GroupInfo["OpenEnrollment"].AsBoolean(); |
761 | data.OpenEnrollment = GroupInfo["OpenEnrollment"].AsBoolean(); | 761 | data.ShowInList = GroupInfo["ShowInList"].AsBoolean(); |
762 | data.ShowInList = GroupInfo["ShowInList"].AsBoolean(); | 762 | } |
763 | } | 763 | } |
764 | 764 | ||
765 | return data; | 765 | return data; |
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs index d4b7020..cee8851 100644 --- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs +++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs | |||
@@ -71,6 +71,9 @@ namespace OpenSim.Region.OptionalModules.World.WorldView | |||
71 | 71 | ||
72 | public void RegionLoaded(Scene scene) | 72 | public void RegionLoaded(Scene scene) |
73 | { | 73 | { |
74 | if (!m_Enabled) | ||
75 | return; | ||
76 | |||
74 | m_Generator = scene.RequestModuleInterface<IMapImageGenerator>(); | 77 | m_Generator = scene.RequestModuleInterface<IMapImageGenerator>(); |
75 | if (m_Generator == null) | 78 | if (m_Generator == null) |
76 | { | 79 | { |