aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-31 18:41:24 +0000
committerJustin Clarke Casey2008-03-31 18:41:24 +0000
commit106fd2f616cdd7086cf55325faf78b597d11f092 (patch)
treeb5fd1f438eef62b3530a346cd8642f86fd7122ec /OpenSim/Region/Environment/Scenes
parent* Minor: If a user exists but has no inventory in standalone, automatically c... (diff)
downloadopensim-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 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
1 files changed, 2 insertions, 0 deletions
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 }