diff options
author | Teravus Ovares | 2008-08-25 07:35:17 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-08-25 07:35:17 +0000 |
commit | 2912aafe259727351eb9405532e45aa3501b7e9a (patch) | |
tree | 34774a49306ae19a6682580d41927fcfb222ea6e /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | Mantis#2043. Thank you kindly, Ralphos for a patch that addresses: (diff) | |
download | opensim-SC_OLD-2912aafe259727351eb9405532e45aa3501b7e9a.zip opensim-SC_OLD-2912aafe259727351eb9405532e45aa3501b7e9a.tar.gz opensim-SC_OLD-2912aafe259727351eb9405532e45aa3501b7e9a.tar.bz2 opensim-SC_OLD-2912aafe259727351eb9405532e45aa3501b7e9a.tar.xz |
* This commit incorporates the heart of the OpenGridProtocol patch that is currently on Forge in a nice, friendly modular format.
* There are a lot of changes and this is quite experimental. It's off by default, but you can turn it on by examining the bottom of the opensim.ini.example for the proper OpenSim.ini settings. Remember, you still need an agent domain..
* Furthermore, it isn't quite right when it comes to teleporting to remote regions (place_avatar)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index a21f701..6f3267a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2599,6 +2599,17 @@ namespace OpenSim.Region.Environment.Scenes | |||
2599 | "[CONNECTION DEBUGGING]: Skipping this region for welcoming avatar {0} [{1}] at {2}", | 2599 | "[CONNECTION DEBUGGING]: Skipping this region for welcoming avatar {0} [{1}] at {2}", |
2600 | agent.AgentID, regionHandle, RegionInfo.RegionName); | 2600 | agent.AgentID, regionHandle, RegionInfo.RegionName); |
2601 | } | 2601 | } |
2602 | |||
2603 | } | ||
2604 | |||
2605 | public void UpdateCircuitData(AgentCircuitData data) | ||
2606 | { | ||
2607 | m_authenticateHandler.UpdateAgentData(data); | ||
2608 | } | ||
2609 | |||
2610 | public bool ChangeCircuitCode(uint oldcc, uint newcc) | ||
2611 | { | ||
2612 | return m_authenticateHandler.TryChangeCiruitCode(oldcc, newcc); | ||
2602 | } | 2613 | } |
2603 | 2614 | ||
2604 | protected void HandleLogOffUserFromGrid(ulong regionHandle, LLUUID AvatarID, LLUUID RegionSecret, string message) | 2615 | protected void HandleLogOffUserFromGrid(ulong regionHandle, LLUUID AvatarID, LLUUID RegionSecret, string message) |
@@ -2664,6 +2675,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
2664 | m_capsHandlers[agentId] = cap; | 2675 | m_capsHandlers[agentId] = cap; |
2665 | } | 2676 | } |
2666 | 2677 | ||
2678 | public Caps GetCapsHandlerForUser(LLUUID agentId) | ||
2679 | { | ||
2680 | lock (m_capsHandlers) | ||
2681 | { | ||
2682 | if (m_capsHandlers.ContainsKey(agentId)) | ||
2683 | { | ||
2684 | return m_capsHandlers[agentId]; | ||
2685 | } | ||
2686 | } | ||
2687 | return null; | ||
2688 | } | ||
2689 | |||
2667 | /// <summary> | 2690 | /// <summary> |
2668 | /// Remove the caps handler for a given agent. | 2691 | /// Remove the caps handler for a given agent. |
2669 | /// </summary> | 2692 | /// </summary> |
@@ -3838,6 +3861,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
3838 | m_httpListener.AddStreamHandler(handler); | 3861 | m_httpListener.AddStreamHandler(handler); |
3839 | } | 3862 | } |
3840 | 3863 | ||
3864 | public bool AddLLSDHandler(string path, LLSDMethod handler) | ||
3865 | { | ||
3866 | return m_httpListener.AddLLSDHandler(path, handler); | ||
3867 | } | ||
3868 | |||
3869 | |||
3841 | public void RemoveStreamHandler(string httpMethod, string path) | 3870 | public void RemoveStreamHandler(string httpMethod, string path) |
3842 | { | 3871 | { |
3843 | m_httpListener.RemoveStreamHandler(httpMethod, path); | 3872 | m_httpListener.RemoveStreamHandler(httpMethod, path); |
@@ -3848,6 +3877,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
3848 | m_httpListener.RemoveHTTPHandler(httpMethod, path); | 3877 | m_httpListener.RemoveHTTPHandler(httpMethod, path); |
3849 | } | 3878 | } |
3850 | 3879 | ||
3880 | public bool RemoveLLSDHandler(string path, LLSDMethod handler) | ||
3881 | { | ||
3882 | return m_httpListener.RemoveLLSDHandler(path, handler); | ||
3883 | } | ||
3884 | |||
3851 | #endregion | 3885 | #endregion |
3852 | 3886 | ||
3853 | #region Avatar Appearance Default | 3887 | #region Avatar Appearance Default |