diff options
author | root | 2011-06-30 00:26:03 +0100 |
---|---|---|
committer | root | 2011-06-30 00:26:03 +0100 |
commit | 5f927dc104aac48707c0ea2ff77a3410c3857ecc (patch) | |
tree | 123324ae910db49349e7b07749f49cd172a3d037 /OpenSim/Region/OptionalModules/Avatar | |
parent | Remove friends debug spam (diff) | |
parent | Don't follow inventory links of links. (diff) | |
download | opensim-SC_OLD-5f927dc104aac48707c0ea2ff77a3410c3857ecc.zip opensim-SC_OLD-5f927dc104aac48707c0ea2ff77a3410c3857ecc.tar.gz opensim-SC_OLD-5f927dc104aac48707c0ea2ff77a3410c3857ecc.tar.bz2 opensim-SC_OLD-5f927dc104aac48707c0ea2ff77a3410c3857ecc.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
5 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs index 7304145..77e7acf 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance | |||
113 | { | 113 | { |
114 | bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(client); | 114 | bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(client); |
115 | MainConsole.Instance.OutputFormat( | 115 | MainConsole.Instance.OutputFormat( |
116 | "{0} baked apperance texture is {1}", client.Name, bakedTextureValid ? "OK" : "corrupt"); | 116 | "{0} baked appearance texture is {1}", client.Name, bakedTextureValid ? "OK" : "corrupt"); |
117 | } | 117 | } |
118 | }); | 118 | }); |
119 | } | 119 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 4f1097e..4f86e42 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -417,9 +417,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
417 | public string ParcelVoiceInfoRequest(Scene scene, string request, string path, string param, | 417 | public string ParcelVoiceInfoRequest(Scene scene, string request, string path, string param, |
418 | UUID agentID, Caps caps) | 418 | UUID agentID, Caps caps) |
419 | { | 419 | { |
420 | // m_log.DebugFormat( | 420 | m_log.DebugFormat( |
421 | // "[FreeSwitchVoice][PARCELVOICE]: ParcelVoiceInfoRequest() on {0} for {1}", | 421 | "[FreeSwitchVoice][PARCELVOICE]: ParcelVoiceInfoRequest() on {0} for {1}", |
422 | // scene.RegionInfo.RegionName, agentID); | 422 | scene.RegionInfo.RegionName, agentID); |
423 | 423 | ||
424 | ScenePresence avatar = scene.GetScenePresence(agentID); | 424 | ScenePresence avatar = scene.GetScenePresence(agentID); |
425 | string avatarName = avatar.Name; | 425 | string avatarName = avatar.Name; |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index 2bf8489..0800e98 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
70 | // if groups aren't enabled, we're not needed. | 70 | // if groups aren't enabled, we're not needed. |
71 | // if we're not specified as the connector to use, then we're not wanted | 71 | // if we're not specified as the connector to use, then we're not wanted |
72 | if ((groupsConfig.GetBoolean("Enabled", false) == false) | 72 | if ((groupsConfig.GetBoolean("Enabled", false) == false) |
73 | || (groupsConfig.GetString("MessagingModule", "Default") != Name)) | 73 | || (groupsConfig.GetString("MessagingModule", "GroupsMessagingModule") != Name)) |
74 | { | 74 | { |
75 | m_groupMessagingEnabled = false; | 75 | m_groupMessagingEnabled = false; |
76 | return; | 76 | return; |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs index 02751ea..42008da 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs | |||
@@ -200,7 +200,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
200 | // if groups aren't enabled, we're not needed. | 200 | // if groups aren't enabled, we're not needed. |
201 | // if we're not specified as the connector to use, then we're not wanted | 201 | // if we're not specified as the connector to use, then we're not wanted |
202 | if ((groupsConfig.GetBoolean("Enabled", false) == false) | 202 | if ((groupsConfig.GetBoolean("Enabled", false) == false) |
203 | || (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name)) | 203 | || (groupsConfig.GetString("ServicesConnectorModule", "XmlRpcGroupsServicesConnector") != Name)) |
204 | { | 204 | { |
205 | m_connectorEnabled = false; | 205 | m_connectorEnabled = false; |
206 | return; | 206 | return; |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index 2631ac1..a08bcd0 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | |||
@@ -109,7 +109,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
109 | // if groups aren't enabled, we're not needed. | 109 | // if groups aren't enabled, we're not needed. |
110 | // if we're not specified as the connector to use, then we're not wanted | 110 | // if we're not specified as the connector to use, then we're not wanted |
111 | if ((groupsConfig.GetBoolean("Enabled", false) == false) | 111 | if ((groupsConfig.GetBoolean("Enabled", false) == false) |
112 | || (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name)) | 112 | || (groupsConfig.GetString("ServicesConnectorModule", "XmlRpcGroupsServicesConnector") != Name)) |
113 | { | 113 | { |
114 | m_connectorEnabled = false; | 114 | m_connectorEnabled = false; |
115 | return; | 115 | return; |