ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* From: Dr Scofield <hud@zurich.ibm.com>

Browse Source 
* (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. "
This commit is contained in:
Justin Clarke Casey
2008-03-31 18:41:24 +00:00
parent 93303072dd
commit 106fd2f616
6 changed files with 173 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -240,7 +240,16 @@ namespace OpenSim
{
config.Set("enabled", "false");
}
if (DefaultConfig.Configs["Voice"] == null)
DefaultConfig.AddConfig("Voice");
config = DefaultConfig.Configs["Voice"];
if (config != null)
{
config.Set("enabled", "false");
}
return DefaultConfig;
}
protected void ReadConfigSettings()

2
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -1590,6 +1590,7 @@ namespace OpenSim.Region.Environment.Scenes
//m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
//m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
}
public void HandleRemoveKnownRegionsFromAvatar(LLUUID avatarID, List<ulong> regionslst)
{
ScenePresence av = GetScenePresence(avatarID);
@@ -1740,6 +1741,7 @@ namespace OpenSim.Region.Environment.Scenes
cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset;
cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset;
cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS;
cap.CAPSGetUserDetails = CommsManager.UserProfileCacheService.GetUserDetails;
m_capsHandlers[agentId] = cap;
}