Add copyright headers. Formatting cleanup.
parent
5ea4faa6f2
commit
6aa5d3904d
|
@ -458,10 +458,10 @@ namespace OpenSim.Framework.Servers
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string StatReport()
|
||||||
public string StatReport() {
|
{
|
||||||
return m_stats.XReport();
|
return m_stats.XReport();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void RemovePIDFile()
|
protected void RemovePIDFile()
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,10 +51,10 @@ namespace OpenSim.Framework.Statistics
|
||||||
|
|
||||||
return sb.ToString();
|
return sb.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual string XReport()
|
public virtual string XReport()
|
||||||
{
|
{
|
||||||
return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;
|
return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,13 +37,13 @@ namespace OpenSim.Framework.Statistics
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
string Report();
|
string Report();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Report back collected statistical information in json
|
/// Report back collected statistical information in json
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// A <see cref="System.String"/>
|
/// A <see cref="System.String"/>
|
||||||
/// </returns>
|
/// </returns>
|
||||||
string XReport();
|
string XReport();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -383,45 +383,44 @@ Asset service request failures: {3}" + Environment.NewLine,
|
||||||
|
|
||||||
return sb.ToString();
|
return sb.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Report back collected statistical information.
|
/// Report back collected statistical information.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public override string XReport()
|
public override string XReport()
|
||||||
{
|
{
|
||||||
OSDMap args = new OSDMap(28);
|
OSDMap args = new OSDMap(28);
|
||||||
args["AssetsInCache"] = OSD.FromReal(AssetsInCache);
|
args["AssetsInCache"] = OSD.FromReal(AssetsInCache);
|
||||||
args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0);
|
args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0);
|
||||||
args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests);
|
args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests);
|
||||||
args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures);
|
args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures);
|
||||||
args["abnormalClientThreadTerminations"] = OSD.FromReal(abnormalClientThreadTerminations);
|
args["abnormalClientThreadTerminations"] = OSD.FromReal(abnormalClientThreadTerminations);
|
||||||
args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures);
|
args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures);
|
||||||
args["Dilatn"] = OSD.FromReal(timeDilation);
|
args["Dilatn"] = OSD.FromReal(timeDilation);
|
||||||
args["SimFPS"] = OSD.FromReal(simFps);
|
args["SimFPS"] = OSD.FromReal(simFps);
|
||||||
args["PhyFPS"] = OSD.FromReal(physicsFps);
|
args["PhyFPS"] = OSD.FromReal(physicsFps);
|
||||||
args["AgntUp"] = OSD.FromReal(agentUpdates);
|
args["AgntUp"] = OSD.FromReal(agentUpdates);
|
||||||
args["RootAg"] = OSD.FromReal(rootAgents);
|
args["RootAg"] = OSD.FromReal(rootAgents);
|
||||||
args["ChldAg"] = OSD.FromReal(childAgents);
|
args["ChldAg"] = OSD.FromReal(childAgents);
|
||||||
args["Prims"] = OSD.FromReal(totalPrims);
|
args["Prims"] = OSD.FromReal(totalPrims);
|
||||||
args["AtvPrm"] = OSD.FromReal(activePrims);
|
args["AtvPrm"] = OSD.FromReal(activePrims);
|
||||||
args["AtvScr"] = OSD.FromReal(activeScripts);
|
args["AtvScr"] = OSD.FromReal(activeScripts);
|
||||||
args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond);
|
args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond);
|
||||||
args["PktsIn"] = OSD.FromReal(inPacketsPerSecond);
|
args["PktsIn"] = OSD.FromReal(inPacketsPerSecond);
|
||||||
args["PktOut"] = OSD.FromReal(outPacketsPerSecond);
|
args["PktOut"] = OSD.FromReal(outPacketsPerSecond);
|
||||||
args["PendDl"] = OSD.FromReal(pendingDownloads);
|
args["PendDl"] = OSD.FromReal(pendingDownloads);
|
||||||
args["PendUl"] = OSD.FromReal(pendingUploads);
|
args["PendUl"] = OSD.FromReal(pendingUploads);
|
||||||
args["UnackB"] = OSD.FromReal(unackedBytes);
|
args["UnackB"] = OSD.FromReal(unackedBytes);
|
||||||
args["TotlFt"] = OSD.FromReal(totalFrameTime);
|
args["TotlFt"] = OSD.FromReal(totalFrameTime);
|
||||||
args["NetFt"] = OSD.FromReal(netFrameTime);
|
args["NetFt"] = OSD.FromReal(netFrameTime);
|
||||||
args["PhysFt"] = OSD.FromReal(physicsFrameTime);
|
args["PhysFt"] = OSD.FromReal(physicsFrameTime);
|
||||||
args["OthrFt"] = OSD.FromReal(otherFrameTime);
|
args["OthrFt"] = OSD.FromReal(otherFrameTime);
|
||||||
args["AgntFt"] = OSD.FromReal(agentFrameTime);
|
args["AgntFt"] = OSD.FromReal(agentFrameTime);
|
||||||
args["ImgsFt"] = OSD.FromReal(imageFrameTime);
|
args["ImgsFt"] = OSD.FromReal(imageFrameTime);
|
||||||
args["Memory"] = OSD.FromString(base.XReport());
|
args["Memory"] = OSD.FromString(base.XReport());
|
||||||
|
|
||||||
string strBuffer = "";
|
string strBuffer = "";
|
||||||
byte[] buffer = new byte[1];
|
byte[] buffer = new byte[1];
|
||||||
|
|
||||||
strBuffer = OSDParser.SerializeJsonString(args);
|
strBuffer = OSDParser.SerializeJsonString(args);
|
||||||
|
@ -452,10 +451,10 @@ Asset service request failures: {3}" + Environment.NewLine,
|
||||||
{
|
{
|
||||||
return m_statsProvider.GetStats();
|
return m_statsProvider.GetStats();
|
||||||
}
|
}
|
||||||
|
|
||||||
public string XReport()
|
public string XReport()
|
||||||
{
|
{
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -813,14 +813,14 @@ namespace OpenSim
|
||||||
/// Currently prints the same a "show stats" plus the uptime of the sim
|
/// Currently prints the same a "show stats" plus the uptime of the sim
|
||||||
public class XSimStatusHandler : IStreamedRequestHandler
|
public class XSimStatusHandler : IStreamedRequestHandler
|
||||||
{
|
{
|
||||||
OpenSimBase m_opensim;
|
OpenSimBase m_opensim;
|
||||||
|
|
||||||
public XSimStatusHandler(OpenSimBase sim)
|
public XSimStatusHandler(OpenSimBase sim)
|
||||||
// public XSimStatusHandler(BaseOpenSimServer sim)
|
// public XSimStatusHandler(BaseOpenSimServer sim)
|
||||||
{
|
{
|
||||||
m_opensim = sim;
|
m_opensim = sim;
|
||||||
}
|
}
|
||||||
|
|
||||||
public byte[] Handle(string path, Stream request,
|
public byte[] Handle(string path, Stream request,
|
||||||
OSHttpRequest httpRequest, OSHttpResponse httpResponse)
|
OSHttpRequest httpRequest, OSHttpResponse httpResponse)
|
||||||
{
|
{
|
||||||
|
|
|
@ -10311,10 +10311,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
LLPacketHandler handler = (LLPacketHandler) m_PacketHandler;
|
LLPacketHandler handler = (LLPacketHandler) m_PacketHandler;
|
||||||
return handler.PacketQueue.GetStats();
|
return handler.PacketQueue.GetStats();
|
||||||
}
|
}
|
||||||
|
|
||||||
public string XReport()
|
public string XReport()
|
||||||
{
|
{
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -546,8 +546,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
|
||||||
// through reconnect.
|
// through reconnect.
|
||||||
|
|
||||||
if (m_enabled && (m_resetk == resetk))
|
if (m_enabled && (m_resetk == resetk))
|
||||||
Reconnect();
|
Reconnect();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)",
|
private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)",
|
||||||
|
|
|
@ -43,7 +43,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
|
|
||||||
Hashtable response = new Hashtable();
|
Hashtable response = new Hashtable();
|
||||||
|
|
||||||
foreach(DictionaryEntry item in request)
|
foreach (DictionaryEntry item in request)
|
||||||
{
|
{
|
||||||
m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value);
|
m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value);
|
||||||
}
|
}
|
||||||
|
@ -52,37 +52,37 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
response["keepalive"] = false;
|
response["keepalive"] = false;
|
||||||
response["int_response_code"]=200;
|
response["int_response_code"]=200;
|
||||||
response["str_response_string"] = @"<?xml version=""1.0"" encoding=""utf-8""?>
|
response["str_response_string"] = @"<?xml version=""1.0"" encoding=""utf-8""?>
|
||||||
<document type=""freeswitch/xml"">
|
<document type=""freeswitch/xml"">
|
||||||
<section name=""dialplan"">
|
<section name=""dialplan"">
|
||||||
<context name=""default"">
|
<context name=""default"">
|
||||||
|
|
||||||
<!-- dial via SIP uri -->
|
<!-- dial via SIP uri -->
|
||||||
<extension name=""sip_uri"">
|
<extension name=""sip_uri"">
|
||||||
<condition field=""destination_number"" expression=""^sip:(.*)$"">
|
<condition field=""destination_number"" expression=""^sip:(.*)$"">
|
||||||
<action application=""bridge"" data=""sofia/${use_profile}/$1""/>
|
<action application=""bridge"" data=""sofia/${use_profile}/$1""/>
|
||||||
<!--<action application=""bridge"" data=""$1""/>-->
|
<!--<action application=""bridge"" data=""$1""/>-->
|
||||||
</condition>
|
</condition>
|
||||||
</extension>
|
</extension>
|
||||||
|
|
||||||
<extension name=""opensim_conferences"">
|
<extension name=""opensim_conferences"">
|
||||||
<condition field=""destination_number"" expression=""^confctl-(.*)$"">
|
<condition field=""destination_number"" expression=""^confctl-(.*)$"">
|
||||||
<action application=""answer""/>
|
<action application=""answer""/>
|
||||||
<action application=""conference"" data=""$1-${domain_name}@default""/>
|
<action application=""conference"" data=""$1-${domain_name}@default""/>
|
||||||
</condition>
|
</condition>
|
||||||
</extension>
|
</extension>
|
||||||
|
|
||||||
<extension name=""avatar"">
|
<extension name=""avatar"">
|
||||||
<condition field=""destination_number"" expression=""^(x.*)$"">
|
<condition field=""destination_number"" expression=""^(x.*)$"">
|
||||||
<action application=""bridge"" data=""user/$1""/>
|
<action application=""bridge"" data=""user/$1""/>
|
||||||
</condition>
|
</condition>
|
||||||
</extension>
|
</extension>
|
||||||
|
|
||||||
</context>
|
</context>
|
||||||
</section>
|
</section>
|
||||||
</document>";
|
</document>";
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
//domain=9.20.151.43
|
//domain=9.20.151.43
|
||||||
//ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup
|
//ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup
|
||||||
|
|
||||||
foreach(DictionaryEntry item in request)
|
foreach (DictionaryEntry item in request)
|
||||||
{
|
{
|
||||||
m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value);
|
m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value);
|
||||||
}
|
}
|
||||||
|
@ -71,41 +71,41 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
string eventCallingFunction = (string) request["Event-Calling-Function"];
|
string eventCallingFunction = (string) request["Event-Calling-Function"];
|
||||||
|
|
||||||
|
|
||||||
if(eventCallingFunction=="sofia_reg_parse_auth")
|
if (eventCallingFunction=="sofia_reg_parse_auth")
|
||||||
{
|
{
|
||||||
string sipAuthMethod = (string)request["sip_auth_method"];
|
string sipAuthMethod = (string)request["sip_auth_method"];
|
||||||
|
|
||||||
if(sipAuthMethod=="REGISTER")
|
if (sipAuthMethod=="REGISTER")
|
||||||
{
|
{
|
||||||
response = HandleRegister(request);
|
response = HandleRegister(request);
|
||||||
}
|
}
|
||||||
else if(sipAuthMethod=="INVITE")
|
else if (sipAuthMethod=="INVITE")
|
||||||
{
|
{
|
||||||
response = HandleInvite(request);
|
response = HandleInvite(request);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod);
|
m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod);
|
||||||
response["int_response_code"]=404;
|
response["int_response_code"]=404;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(eventCallingFunction=="switch_xml_locate_user")
|
else if (eventCallingFunction=="switch_xml_locate_user")
|
||||||
{
|
|
||||||
response = HandleLocateUser(request);
|
|
||||||
}
|
|
||||||
else if(eventCallingFunction=="user_data_function") // gets called when an avatar to avatar call is made
|
|
||||||
{
|
{
|
||||||
response = HandleLocateUser(request);
|
response = HandleLocateUser(request);
|
||||||
}
|
}
|
||||||
else if(eventCallingFunction=="user_outgoing_channel")
|
else if (eventCallingFunction=="user_data_function") // gets called when an avatar to avatar call is made
|
||||||
|
{
|
||||||
|
response = HandleLocateUser(request);
|
||||||
|
}
|
||||||
|
else if (eventCallingFunction=="user_outgoing_channel")
|
||||||
{
|
{
|
||||||
response = HandleRegister(request);
|
response = HandleRegister(request);
|
||||||
}
|
}
|
||||||
else if(eventCallingFunction=="config_sofia") // happens once on freeswitch startup
|
else if (eventCallingFunction=="config_sofia") // happens once on freeswitch startup
|
||||||
{
|
{
|
||||||
response = HandleConfigSofia(request);
|
response = HandleConfigSofia(request);
|
||||||
}
|
}
|
||||||
else if(eventCallingFunction=="switch_load_network_lists")
|
else if (eventCallingFunction=="switch_load_network_lists")
|
||||||
{
|
{
|
||||||
//response = HandleLoadNetworkLists(request);
|
//response = HandleLoadNetworkLists(request);
|
||||||
response["int_response_code"]=404;
|
response["int_response_code"]=404;
|
||||||
|
@ -266,24 +266,24 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
"<groups name=\"default\">\r\n"+
|
"<groups name=\"default\">\r\n"+
|
||||||
"<users>\r\n"+
|
"<users>\r\n"+
|
||||||
"<user id=\"$${{default_provider}}\">\r\n"+
|
"<user id=\"$${{default_provider}}\">\r\n"+
|
||||||
"<gateways>\r\n"+
|
"<gateways>\r\n"+
|
||||||
"<gateway name=\"$${{default_provider}}\">\r\n"+
|
"<gateway name=\"$${{default_provider}}\">\r\n"+
|
||||||
"<param name=\"username\" value=\"$${{default_provider_username}}\"/>\r\n"+
|
"<param name=\"username\" value=\"$${{default_provider_username}}\"/>\r\n"+
|
||||||
"<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
|
"<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
|
||||||
"<param name=\"from-user\" value=\"$${{default_provider_username}}\"/>\r\n"+
|
"<param name=\"from-user\" value=\"$${{default_provider_username}}\"/>\r\n"+
|
||||||
"<param name=\"from-domain\" value=\"$${{default_provider_from_domain}}\"/>\r\n"+
|
"<param name=\"from-domain\" value=\"$${{default_provider_from_domain}}\"/>\r\n"+
|
||||||
"<param name=\"expire-seconds\" value=\"600\"/>\r\n"+
|
"<param name=\"expire-seconds\" value=\"600\"/>\r\n"+
|
||||||
"<param name=\"register\" value=\"$${{default_provider_register}}\"/>\r\n"+
|
"<param name=\"register\" value=\"$${{default_provider_register}}\"/>\r\n"+
|
||||||
"<param name=\"retry-seconds\" value=\"30\"/>\r\n"+
|
"<param name=\"retry-seconds\" value=\"30\"/>\r\n"+
|
||||||
"<param name=\"extension\" value=\"$${{default_provider_contact}}\"/>\r\n"+
|
"<param name=\"extension\" value=\"$${{default_provider_contact}}\"/>\r\n"+
|
||||||
"<param name=\"contact-params\" value=\"domain_name=$${{domain}}\"/>\r\n"+
|
"<param name=\"contact-params\" value=\"domain_name=$${{domain}}\"/>\r\n"+
|
||||||
"<param name=\"context\" value=\"public\"/>\r\n"+
|
"<param name=\"context\" value=\"public\"/>\r\n"+
|
||||||
"</gateway>\r\n"+
|
"</gateway>\r\n"+
|
||||||
"</gateways>\r\n"+
|
"</gateways>\r\n"+
|
||||||
"<params>\r\n"+
|
"<params>\r\n"+
|
||||||
"<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
|
"<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
|
||||||
"</params>\r\n"+
|
"</params>\r\n"+
|
||||||
"</user>\r\n"+
|
"</user>\r\n"+
|
||||||
"</users>"+
|
"</users>"+
|
||||||
"</groups>\r\n" +
|
"</groups>\r\n" +
|
||||||
"<variables>\r\n"+
|
"<variables>\r\n"+
|
||||||
|
@ -332,4 +332,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -500,7 +500,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
|
||||||
// is this a dialplan or directory request
|
// is this a dialplan or directory request
|
||||||
string section = (string) requestBody["section"];
|
string section = (string) requestBody["section"];
|
||||||
|
|
||||||
if(section=="directory")
|
if (section=="directory")
|
||||||
response = m_FreeSwitchDirectory.HandleDirectoryRequest(requestBody);
|
response = m_FreeSwitchDirectory.HandleDirectoryRequest(requestBody);
|
||||||
else if (section=="dialplan")
|
else if (section=="dialplan")
|
||||||
response = m_FreeSwitchDialplan.HandleDialplanRequest(requestBody);
|
response = m_FreeSwitchDialplan.HandleDialplanRequest(requestBody);
|
||||||
|
|
|
@ -294,7 +294,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||||
|
|
||||||
string firstname, lastname;
|
string firstname, lastname;
|
||||||
IClientAPI agent;
|
IClientAPI agent;
|
||||||
if( m_ActiveClients.TryGetValue(AgentID, out agent) )
|
if (m_ActiveClients.TryGetValue(AgentID, out agent))
|
||||||
{
|
{
|
||||||
firstname = agent.FirstName;
|
firstname = agent.FirstName;
|
||||||
lastname = agent.LastName;
|
lastname = agent.LastName;
|
||||||
|
@ -405,7 +405,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||||
}
|
}
|
||||||
|
|
||||||
UUID GroupID = new UUID(im.toAgentID);
|
UUID GroupID = new UUID(im.toAgentID);
|
||||||
if( m_groupData.GetGroupRecord(GroupID, null) != null)
|
if (m_groupData.GetGroupRecord(GroupID, null) != null)
|
||||||
{
|
{
|
||||||
UUID NoticeID = UUID.Random();
|
UUID NoticeID = UUID.Random();
|
||||||
string Subject = im.message.Substring(0, im.message.IndexOf('|'));
|
string Subject = im.message.Substring(0, im.message.IndexOf('|'));
|
||||||
|
@ -453,9 +453,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||||
GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice);
|
GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice);
|
||||||
|
|
||||||
// Send notice out to everyone that wants notices
|
// Send notice out to everyone that wants notices
|
||||||
foreach( GroupMembersData member in m_groupData.GetGroupMembers(GroupID) )
|
foreach (GroupMembersData member in m_groupData.GetGroupMembers(GroupID))
|
||||||
{
|
{
|
||||||
if( member.AcceptNotices )
|
if (member.AcceptNotices)
|
||||||
{
|
{
|
||||||
msg.toAgentID = member.AgentID.Guid;
|
msg.toAgentID = member.AgentID.Guid;
|
||||||
m_MsgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
|
m_MsgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
|
||||||
|
@ -712,7 +712,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||||
{
|
{
|
||||||
if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
|
if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
|
||||||
|
|
||||||
if( m_groupData.GetGroupRecord(UUID.Zero, name) != null )
|
if (m_groupData.GetGroupRecord(UUID.Zero, name) != null)
|
||||||
{
|
{
|
||||||
remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists.");
|
remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists.");
|
||||||
return UUID.Zero;
|
return UUID.Zero;
|
||||||
|
|
|
@ -1,4 +1,31 @@
|
||||||
using System;
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces;
|
using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces;
|
||||||
|
|
|
@ -1,3 +1,30 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
||||||
{
|
{
|
||||||
public interface IMRMModule
|
public interface IMRMModule
|
||||||
|
|
|
@ -1,4 +1,31 @@
|
||||||
using System;
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,31 @@
|
||||||
using System;
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
|
||||||
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,31 @@
|
||||||
using System;
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
|
|
Loading…
Reference in New Issue