diff options
author | Jeff Ames | 2009-04-22 00:48:56 +0000 |
---|---|---|
committer | Jeff Ames | 2009-04-22 00:48:56 +0000 |
commit | 6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f (patch) | |
tree | 55509d75eca81eb3b463984a1981c3a4d4fcce54 | |
parent | Thank you kindly, MCortez, for a patch that: (diff) | |
download | opensim-SC_OLD-6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f.zip opensim-SC_OLD-6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f.tar.gz opensim-SC_OLD-6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f.tar.bz2 opensim-SC_OLD-6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f.tar.xz |
Add copyright headers. Formatting cleanup.
16 files changed, 283 insertions, 150 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index f22a6e8..45b45b2 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -458,10 +458,10 @@ namespace OpenSim.Framework.Servers | |||
458 | } | 458 | } |
459 | } | 459 | } |
460 | 460 | ||
461 | 461 | public string StatReport() | |
462 | public string StatReport() { | 462 | { |
463 | return m_stats.XReport(); | 463 | return m_stats.XReport(); |
464 | } | 464 | } |
465 | 465 | ||
466 | protected void RemovePIDFile() | 466 | protected void RemovePIDFile() |
467 | { | 467 | { |
diff --git a/OpenSim/Framework/Statistics/BaseStatsCollector.cs b/OpenSim/Framework/Statistics/BaseStatsCollector.cs index a5ce8aa..ca0907d 100644 --- a/OpenSim/Framework/Statistics/BaseStatsCollector.cs +++ b/OpenSim/Framework/Statistics/BaseStatsCollector.cs | |||
@@ -51,10 +51,10 @@ namespace OpenSim.Framework.Statistics | |||
51 | 51 | ||
52 | return sb.ToString(); | 52 | return sb.ToString(); |
53 | } | 53 | } |
54 | 54 | ||
55 | public virtual string XReport() | 55 | public virtual string XReport() |
56 | { | 56 | { |
57 | return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ; | 57 | return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ; |
58 | } | 58 | } |
59 | } | 59 | } |
60 | } | 60 | } |
diff --git a/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs b/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs index 48f28ee..ac8133d 100644 --- a/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs +++ b/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs | |||
@@ -37,13 +37,13 @@ namespace OpenSim.Framework.Statistics | |||
37 | /// </summary> | 37 | /// </summary> |
38 | /// <returns></returns> | 38 | /// <returns></returns> |
39 | string Report(); | 39 | string Report(); |
40 | 40 | ||
41 | /// <summary> | 41 | /// <summary> |
42 | /// Report back collected statistical information in json | 42 | /// Report back collected statistical information in json |
43 | /// </summary> | 43 | /// </summary> |
44 | /// <returns> | 44 | /// <returns> |
45 | /// A <see cref="System.String"/> | 45 | /// A <see cref="System.String"/> |
46 | /// </returns> | 46 | /// </returns> |
47 | string XReport(); | 47 | string XReport(); |
48 | } | 48 | } |
49 | } | 49 | } |
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs index 8b8b52a..d3513fc 100644 --- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs +++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs | |||
@@ -383,45 +383,44 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
383 | 383 | ||
384 | return sb.ToString(); | 384 | return sb.ToString(); |
385 | } | 385 | } |
386 | 386 | ||
387 | |||
388 | /// <summary> | 387 | /// <summary> |
389 | /// Report back collected statistical information. | 388 | /// Report back collected statistical information. |
390 | /// </summary> | 389 | /// </summary> |
391 | /// <returns></returns> | 390 | /// <returns></returns> |
392 | public override string XReport() | 391 | public override string XReport() |
393 | { | 392 | { |
394 | OSDMap args = new OSDMap(28); | 393 | OSDMap args = new OSDMap(28); |
395 | args["AssetsInCache"] = OSD.FromReal(AssetsInCache); | 394 | args["AssetsInCache"] = OSD.FromReal(AssetsInCache); |
396 | args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0); | 395 | args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0); |
397 | args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests); | 396 | args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests); |
398 | args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures); | 397 | args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures); |
399 | args["abnormalClientThreadTerminations"] = OSD.FromReal(abnormalClientThreadTerminations); | 398 | args["abnormalClientThreadTerminations"] = OSD.FromReal(abnormalClientThreadTerminations); |
400 | args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures); | 399 | args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures); |
401 | args["Dilatn"] = OSD.FromReal(timeDilation); | 400 | args["Dilatn"] = OSD.FromReal(timeDilation); |
402 | args["SimFPS"] = OSD.FromReal(simFps); | 401 | args["SimFPS"] = OSD.FromReal(simFps); |
403 | args["PhyFPS"] = OSD.FromReal(physicsFps); | 402 | args["PhyFPS"] = OSD.FromReal(physicsFps); |
404 | args["AgntUp"] = OSD.FromReal(agentUpdates); | 403 | args["AgntUp"] = OSD.FromReal(agentUpdates); |
405 | args["RootAg"] = OSD.FromReal(rootAgents); | 404 | args["RootAg"] = OSD.FromReal(rootAgents); |
406 | args["ChldAg"] = OSD.FromReal(childAgents); | 405 | args["ChldAg"] = OSD.FromReal(childAgents); |
407 | args["Prims"] = OSD.FromReal(totalPrims); | 406 | args["Prims"] = OSD.FromReal(totalPrims); |
408 | args["AtvPrm"] = OSD.FromReal(activePrims); | 407 | args["AtvPrm"] = OSD.FromReal(activePrims); |
409 | args["AtvScr"] = OSD.FromReal(activeScripts); | 408 | args["AtvScr"] = OSD.FromReal(activeScripts); |
410 | args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond); | 409 | args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond); |
411 | args["PktsIn"] = OSD.FromReal(inPacketsPerSecond); | 410 | args["PktsIn"] = OSD.FromReal(inPacketsPerSecond); |
412 | args["PktOut"] = OSD.FromReal(outPacketsPerSecond); | 411 | args["PktOut"] = OSD.FromReal(outPacketsPerSecond); |
413 | args["PendDl"] = OSD.FromReal(pendingDownloads); | 412 | args["PendDl"] = OSD.FromReal(pendingDownloads); |
414 | args["PendUl"] = OSD.FromReal(pendingUploads); | 413 | args["PendUl"] = OSD.FromReal(pendingUploads); |
415 | args["UnackB"] = OSD.FromReal(unackedBytes); | 414 | args["UnackB"] = OSD.FromReal(unackedBytes); |
416 | args["TotlFt"] = OSD.FromReal(totalFrameTime); | 415 | args["TotlFt"] = OSD.FromReal(totalFrameTime); |
417 | args["NetFt"] = OSD.FromReal(netFrameTime); | 416 | args["NetFt"] = OSD.FromReal(netFrameTime); |
418 | args["PhysFt"] = OSD.FromReal(physicsFrameTime); | 417 | args["PhysFt"] = OSD.FromReal(physicsFrameTime); |
419 | args["OthrFt"] = OSD.FromReal(otherFrameTime); | 418 | args["OthrFt"] = OSD.FromReal(otherFrameTime); |
420 | args["AgntFt"] = OSD.FromReal(agentFrameTime); | 419 | args["AgntFt"] = OSD.FromReal(agentFrameTime); |
421 | args["ImgsFt"] = OSD.FromReal(imageFrameTime); | 420 | args["ImgsFt"] = OSD.FromReal(imageFrameTime); |
422 | args["Memory"] = OSD.FromString(base.XReport()); | 421 | args["Memory"] = OSD.FromString(base.XReport()); |
423 | 422 | ||
424 | string strBuffer = ""; | 423 | string strBuffer = ""; |
425 | byte[] buffer = new byte[1]; | 424 | byte[] buffer = new byte[1]; |
426 | 425 | ||
427 | strBuffer = OSDParser.SerializeJsonString(args); | 426 | strBuffer = OSDParser.SerializeJsonString(args); |
@@ -452,10 +451,10 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
452 | { | 451 | { |
453 | return m_statsProvider.GetStats(); | 452 | return m_statsProvider.GetStats(); |
454 | } | 453 | } |
455 | 454 | ||
456 | public string XReport() | 455 | public string XReport() |
457 | { | 456 | { |
458 | return ""; | 457 | return ""; |
459 | } | 458 | } |
460 | } | 459 | } |
461 | } | 460 | } |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 18abcad..b28e880 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -813,14 +813,14 @@ namespace OpenSim | |||
813 | /// Currently prints the same a "show stats" plus the uptime of the sim | 813 | /// Currently prints the same a "show stats" plus the uptime of the sim |
814 | public class XSimStatusHandler : IStreamedRequestHandler | 814 | public class XSimStatusHandler : IStreamedRequestHandler |
815 | { | 815 | { |
816 | OpenSimBase m_opensim; | 816 | OpenSimBase m_opensim; |
817 | 817 | ||
818 | public XSimStatusHandler(OpenSimBase sim) | 818 | public XSimStatusHandler(OpenSimBase sim) |
819 | // public XSimStatusHandler(BaseOpenSimServer sim) | 819 | // public XSimStatusHandler(BaseOpenSimServer sim) |
820 | { | 820 | { |
821 | m_opensim = sim; | 821 | m_opensim = sim; |
822 | } | 822 | } |
823 | 823 | ||
824 | public byte[] Handle(string path, Stream request, | 824 | public byte[] Handle(string path, Stream request, |
825 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 825 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
826 | { | 826 | { |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 4681230..40f25ae 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -10311,10 +10311,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10311 | LLPacketHandler handler = (LLPacketHandler) m_PacketHandler; | 10311 | LLPacketHandler handler = (LLPacketHandler) m_PacketHandler; |
10312 | return handler.PacketQueue.GetStats(); | 10312 | return handler.PacketQueue.GetStats(); |
10313 | } | 10313 | } |
10314 | 10314 | ||
10315 | public string XReport() | 10315 | public string XReport() |
10316 | { | 10316 | { |
10317 | return ""; | 10317 | return ""; |
10318 | } | 10318 | } |
10319 | } | 10319 | } |
10320 | } | 10320 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs index ca85817..c621fd3 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs | |||
@@ -546,8 +546,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
546 | // through reconnect. | 546 | // through reconnect. |
547 | 547 | ||
548 | if (m_enabled && (m_resetk == resetk)) | 548 | if (m_enabled && (m_resetk == resetk)) |
549 | Reconnect(); | 549 | Reconnect(); |
550 | |||
551 | } | 550 | } |
552 | 551 | ||
553 | private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)", | 552 | private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)", |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs index 2a2b4a3..d8fce67 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
43 | 43 | ||
44 | Hashtable response = new Hashtable(); | 44 | Hashtable response = new Hashtable(); |
45 | 45 | ||
46 | foreach(DictionaryEntry item in request) | 46 | foreach (DictionaryEntry item in request) |
47 | { | 47 | { |
48 | m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value); | 48 | m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value); |
49 | } | 49 | } |
@@ -52,37 +52,37 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
52 | response["keepalive"] = false; | 52 | response["keepalive"] = false; |
53 | response["int_response_code"]=200; | 53 | response["int_response_code"]=200; |
54 | response["str_response_string"] = @"<?xml version=""1.0"" encoding=""utf-8""?> | 54 | response["str_response_string"] = @"<?xml version=""1.0"" encoding=""utf-8""?> |
55 | <document type=""freeswitch/xml""> | 55 | <document type=""freeswitch/xml""> |
56 | <section name=""dialplan""> | 56 | <section name=""dialplan""> |
57 | <context name=""default""> | 57 | <context name=""default""> |
58 | 58 | ||
59 | <!-- dial via SIP uri --> | 59 | <!-- dial via SIP uri --> |
60 | <extension name=""sip_uri""> | 60 | <extension name=""sip_uri""> |
61 | <condition field=""destination_number"" expression=""^sip:(.*)$""> | 61 | <condition field=""destination_number"" expression=""^sip:(.*)$""> |
62 | <action application=""bridge"" data=""sofia/${use_profile}/$1""/> | 62 | <action application=""bridge"" data=""sofia/${use_profile}/$1""/> |
63 | <!--<action application=""bridge"" data=""$1""/>--> | 63 | <!--<action application=""bridge"" data=""$1""/>--> |
64 | </condition> | 64 | </condition> |
65 | </extension> | 65 | </extension> |
66 | 66 | ||
67 | <extension name=""opensim_conferences""> | 67 | <extension name=""opensim_conferences""> |
68 | <condition field=""destination_number"" expression=""^confctl-(.*)$""> | 68 | <condition field=""destination_number"" expression=""^confctl-(.*)$""> |
69 | <action application=""answer""/> | 69 | <action application=""answer""/> |
70 | <action application=""conference"" data=""$1-${domain_name}@default""/> | 70 | <action application=""conference"" data=""$1-${domain_name}@default""/> |
71 | </condition> | 71 | </condition> |
72 | </extension> | 72 | </extension> |
73 | 73 | ||
74 | <extension name=""avatar""> | 74 | <extension name=""avatar""> |
75 | <condition field=""destination_number"" expression=""^(x.*)$""> | 75 | <condition field=""destination_number"" expression=""^(x.*)$""> |
76 | <action application=""bridge"" data=""user/$1""/> | 76 | <action application=""bridge"" data=""user/$1""/> |
77 | </condition> | 77 | </condition> |
78 | </extension> | 78 | </extension> |
79 | 79 | ||
80 | </context> | 80 | </context> |
81 | </section> | 81 | </section> |
82 | </document>"; | 82 | </document>"; |
83 | 83 | ||
84 | return response; | 84 | return response; |
85 | } | 85 | } |
86 | } | 86 | } |
87 | 87 | ||
88 | } \ No newline at end of file | 88 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs index 9959d11..4113976 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
63 | //domain=9.20.151.43 | 63 | //domain=9.20.151.43 |
64 | //ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup | 64 | //ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup |
65 | 65 | ||
66 | foreach(DictionaryEntry item in request) | 66 | foreach (DictionaryEntry item in request) |
67 | { | 67 | { |
68 | m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value); | 68 | m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value); |
69 | } | 69 | } |
@@ -71,41 +71,41 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
71 | string eventCallingFunction = (string) request["Event-Calling-Function"]; | 71 | string eventCallingFunction = (string) request["Event-Calling-Function"]; |
72 | 72 | ||
73 | 73 | ||
74 | if(eventCallingFunction=="sofia_reg_parse_auth") | 74 | if (eventCallingFunction=="sofia_reg_parse_auth") |
75 | { | 75 | { |
76 | string sipAuthMethod = (string)request["sip_auth_method"]; | 76 | string sipAuthMethod = (string)request["sip_auth_method"]; |
77 | 77 | ||
78 | if(sipAuthMethod=="REGISTER") | 78 | if (sipAuthMethod=="REGISTER") |
79 | { | 79 | { |
80 | response = HandleRegister(request); | 80 | response = HandleRegister(request); |
81 | } | 81 | } |
82 | else if(sipAuthMethod=="INVITE") | 82 | else if (sipAuthMethod=="INVITE") |
83 | { | 83 | { |
84 | response = HandleInvite(request); | 84 | response = HandleInvite(request); |
85 | } | 85 | } |
86 | else | 86 | else |
87 | { | 87 | { |
88 | m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod); | 88 | m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod); |
89 | response["int_response_code"]=404; | 89 | response["int_response_code"]=404; |
90 | } | 90 | } |
91 | } | 91 | } |
92 | else if(eventCallingFunction=="switch_xml_locate_user") | 92 | else if (eventCallingFunction=="switch_xml_locate_user") |
93 | { | 93 | { |
94 | response = HandleLocateUser(request); | 94 | response = HandleLocateUser(request); |
95 | } | 95 | } |
96 | else if(eventCallingFunction=="user_data_function") // gets called when an avatar to avatar call is made | 96 | else if (eventCallingFunction=="user_data_function") // gets called when an avatar to avatar call is made |
97 | { | 97 | { |
98 | response = HandleLocateUser(request); | 98 | response = HandleLocateUser(request); |
99 | } | 99 | } |
100 | else if(eventCallingFunction=="user_outgoing_channel") | 100 | else if (eventCallingFunction=="user_outgoing_channel") |
101 | { | 101 | { |
102 | response = HandleRegister(request); | 102 | response = HandleRegister(request); |
103 | } | 103 | } |
104 | else if(eventCallingFunction=="config_sofia") // happens once on freeswitch startup | 104 | else if (eventCallingFunction=="config_sofia") // happens once on freeswitch startup |
105 | { | 105 | { |
106 | response = HandleConfigSofia(request); | 106 | response = HandleConfigSofia(request); |
107 | } | 107 | } |
108 | else if(eventCallingFunction=="switch_load_network_lists") | 108 | else if (eventCallingFunction=="switch_load_network_lists") |
109 | { | 109 | { |
110 | //response = HandleLoadNetworkLists(request); | 110 | //response = HandleLoadNetworkLists(request); |
111 | response["int_response_code"]=404; | 111 | response["int_response_code"]=404; |
@@ -266,24 +266,24 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
266 | "<groups name=\"default\">\r\n"+ | 266 | "<groups name=\"default\">\r\n"+ |
267 | "<users>\r\n"+ | 267 | "<users>\r\n"+ |
268 | "<user id=\"$${{default_provider}}\">\r\n"+ | 268 | "<user id=\"$${{default_provider}}\">\r\n"+ |
269 | "<gateways>\r\n"+ | 269 | "<gateways>\r\n"+ |
270 | "<gateway name=\"$${{default_provider}}\">\r\n"+ | 270 | "<gateway name=\"$${{default_provider}}\">\r\n"+ |
271 | "<param name=\"username\" value=\"$${{default_provider_username}}\"/>\r\n"+ | 271 | "<param name=\"username\" value=\"$${{default_provider_username}}\"/>\r\n"+ |
272 | "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+ | 272 | "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+ |
273 | "<param name=\"from-user\" value=\"$${{default_provider_username}}\"/>\r\n"+ | 273 | "<param name=\"from-user\" value=\"$${{default_provider_username}}\"/>\r\n"+ |
274 | "<param name=\"from-domain\" value=\"$${{default_provider_from_domain}}\"/>\r\n"+ | 274 | "<param name=\"from-domain\" value=\"$${{default_provider_from_domain}}\"/>\r\n"+ |
275 | "<param name=\"expire-seconds\" value=\"600\"/>\r\n"+ | 275 | "<param name=\"expire-seconds\" value=\"600\"/>\r\n"+ |
276 | "<param name=\"register\" value=\"$${{default_provider_register}}\"/>\r\n"+ | 276 | "<param name=\"register\" value=\"$${{default_provider_register}}\"/>\r\n"+ |
277 | "<param name=\"retry-seconds\" value=\"30\"/>\r\n"+ | 277 | "<param name=\"retry-seconds\" value=\"30\"/>\r\n"+ |
278 | "<param name=\"extension\" value=\"$${{default_provider_contact}}\"/>\r\n"+ | 278 | "<param name=\"extension\" value=\"$${{default_provider_contact}}\"/>\r\n"+ |
279 | "<param name=\"contact-params\" value=\"domain_name=$${{domain}}\"/>\r\n"+ | 279 | "<param name=\"contact-params\" value=\"domain_name=$${{domain}}\"/>\r\n"+ |
280 | "<param name=\"context\" value=\"public\"/>\r\n"+ | 280 | "<param name=\"context\" value=\"public\"/>\r\n"+ |
281 | "</gateway>\r\n"+ | 281 | "</gateway>\r\n"+ |
282 | "</gateways>\r\n"+ | 282 | "</gateways>\r\n"+ |
283 | "<params>\r\n"+ | 283 | "<params>\r\n"+ |
284 | "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+ | 284 | "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+ |
285 | "</params>\r\n"+ | 285 | "</params>\r\n"+ |
286 | "</user>\r\n"+ | 286 | "</user>\r\n"+ |
287 | "</users>"+ | 287 | "</users>"+ |
288 | "</groups>\r\n" + | 288 | "</groups>\r\n" + |
289 | "<variables>\r\n"+ | 289 | "<variables>\r\n"+ |
@@ -332,4 +332,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
332 | 332 | ||
333 | } | 333 | } |
334 | 334 | ||
335 | } \ No newline at end of file | 335 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index a8f9de6..fcb1c97 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -500,7 +500,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
500 | // is this a dialplan or directory request | 500 | // is this a dialplan or directory request |
501 | string section = (string) requestBody["section"]; | 501 | string section = (string) requestBody["section"]; |
502 | 502 | ||
503 | if(section=="directory") | 503 | if (section=="directory") |
504 | response = m_FreeSwitchDirectory.HandleDirectoryRequest(requestBody); | 504 | response = m_FreeSwitchDirectory.HandleDirectoryRequest(requestBody); |
505 | else if (section=="dialplan") | 505 | else if (section=="dialplan") |
506 | response = m_FreeSwitchDialplan.HandleDialplanRequest(requestBody); | 506 | response = m_FreeSwitchDialplan.HandleDialplanRequest(requestBody); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs index ec26dff..9f45fd0 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs | |||
@@ -294,7 +294,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
294 | 294 | ||
295 | string firstname, lastname; | 295 | string firstname, lastname; |
296 | IClientAPI agent; | 296 | IClientAPI agent; |
297 | if( m_ActiveClients.TryGetValue(AgentID, out agent) ) | 297 | if (m_ActiveClients.TryGetValue(AgentID, out agent)) |
298 | { | 298 | { |
299 | firstname = agent.FirstName; | 299 | firstname = agent.FirstName; |
300 | lastname = agent.LastName; | 300 | lastname = agent.LastName; |
@@ -405,7 +405,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
405 | } | 405 | } |
406 | 406 | ||
407 | UUID GroupID = new UUID(im.toAgentID); | 407 | UUID GroupID = new UUID(im.toAgentID); |
408 | if( m_groupData.GetGroupRecord(GroupID, null) != null) | 408 | if (m_groupData.GetGroupRecord(GroupID, null) != null) |
409 | { | 409 | { |
410 | UUID NoticeID = UUID.Random(); | 410 | UUID NoticeID = UUID.Random(); |
411 | string Subject = im.message.Substring(0, im.message.IndexOf('|')); | 411 | string Subject = im.message.Substring(0, im.message.IndexOf('|')); |
@@ -453,9 +453,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
453 | GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice); | 453 | GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice); |
454 | 454 | ||
455 | // Send notice out to everyone that wants notices | 455 | // Send notice out to everyone that wants notices |
456 | foreach( GroupMembersData member in m_groupData.GetGroupMembers(GroupID) ) | 456 | foreach (GroupMembersData member in m_groupData.GetGroupMembers(GroupID)) |
457 | { | 457 | { |
458 | if( member.AcceptNotices ) | 458 | if (member.AcceptNotices) |
459 | { | 459 | { |
460 | msg.toAgentID = member.AgentID.Guid; | 460 | msg.toAgentID = member.AgentID.Guid; |
461 | m_MsgTransferModule.SendInstantMessage(msg, delegate(bool success) { }); | 461 | m_MsgTransferModule.SendInstantMessage(msg, delegate(bool success) { }); |
@@ -712,7 +712,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
712 | { | 712 | { |
713 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 713 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
714 | 714 | ||
715 | if( m_groupData.GetGroupRecord(UUID.Zero, name) != null ) | 715 | if (m_groupData.GetGroupRecord(UUID.Zero, name) != null) |
716 | { | 716 | { |
717 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists."); | 717 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists."); |
718 | return UUID.Zero; | 718 | return UUID.Zero; |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs index d3efe9c..d8f7a84 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
4 | using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces; | 31 | using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces; |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IMRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IMRMModule.cs index 05b8bc9..486d0d9 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IMRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IMRMModule.cs | |||
@@ -1,3 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
1 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 28 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
2 | { | 29 | { |
3 | public interface IMRMModule | 30 | public interface IMRMModule |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IExtension.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IExtension.cs index 91c696f..f5beebd 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IExtension.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IExtension.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
4 | 31 | ||
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs index f850a94..13e7934 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | 29 | ||
3 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | 30 | namespace OpenSim.Region.OptionalModules.Scripting.Minimodule |
4 | { | 31 | { |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectShape.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectShape.cs index 0018b2a..27cf279 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectShape.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectShape.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
4 | using OpenMetaverse; | 31 | using OpenMetaverse; |