diff options
author | Justin Clarke Casey | 2008-03-31 18:41:24 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-31 18:41:24 +0000 |
commit | 106fd2f616cdd7086cf55325faf78b597d11f092 (patch) | |
tree | b5fd1f438eef62b3530a346cd8642f86fd7122ec /OpenSim/Region | |
parent | * Minor: If a user exists but has no inventory in standalone, automatically c... (diff) | |
download | opensim-SC_OLD-106fd2f616cdd7086cf55325faf78b597d11f092.zip opensim-SC_OLD-106fd2f616cdd7086cf55325faf78b597d11f092.tar.gz opensim-SC_OLD-106fd2f616cdd7086cf55325faf78b597d11f092.tar.bz2 opensim-SC_OLD-106fd2f616cdd7086cf55325faf78b597d11f092.tar.xz |
* From: Dr Scofield <hud@zurich.ibm.com>
* (and Ansgar/Ansi)
* Fleshes out the voice stubs to better interact with the viewer CAPS requests - no actual voice support yet!
* In his own words
"the attached patch enhances the existing voice support by returning a proper voice account user and password and is preparing the config file so that we can specify a SIP server (not yet working). currently the SIP is hardcoded. the next step is to refactor voice support into a region module. working on that. "
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 60c6127..427fc70 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -240,7 +240,16 @@ namespace OpenSim | |||
240 | { | 240 | { |
241 | config.Set("enabled", "false"); | 241 | config.Set("enabled", "false"); |
242 | } | 242 | } |
243 | |||
244 | if (DefaultConfig.Configs["Voice"] == null) | ||
245 | DefaultConfig.AddConfig("Voice"); | ||
246 | config = DefaultConfig.Configs["Voice"]; | ||
247 | if (config != null) | ||
248 | { | ||
249 | config.Set("enabled", "false"); | ||
250 | } | ||
243 | return DefaultConfig; | 251 | return DefaultConfig; |
252 | |||
244 | } | 253 | } |
245 | 254 | ||
246 | protected void ReadConfigSettings() | 255 | protected void ReadConfigSettings() |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 2f277f9..2fa0459 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1590,6 +1590,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1590 | //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); | 1590 | //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); |
1591 | //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); | 1591 | //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); |
1592 | } | 1592 | } |
1593 | |||
1593 | public void HandleRemoveKnownRegionsFromAvatar(LLUUID avatarID, List<ulong> regionslst) | 1594 | public void HandleRemoveKnownRegionsFromAvatar(LLUUID avatarID, List<ulong> regionslst) |
1594 | { | 1595 | { |
1595 | ScenePresence av = GetScenePresence(avatarID); | 1596 | ScenePresence av = GetScenePresence(avatarID); |
@@ -1740,6 +1741,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1740 | cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset; | 1741 | cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset; |
1741 | cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset; | 1742 | cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset; |
1742 | cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS; | 1743 | cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS; |
1744 | cap.CAPSGetUserDetails = CommsManager.UserProfileCacheService.GetUserDetails; | ||
1743 | 1745 | ||
1744 | m_capsHandlers[agentId] = cap; | 1746 | m_capsHandlers[agentId] = cap; |
1745 | } | 1747 | } |