diff options
author | Justin Clarke Casey | 2008-05-05 18:53:07 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-05 18:53:07 +0000 |
commit | 60a83574f41f964dc2058c80c987045db97421f7 (patch) | |
tree | 79549f01c88b16fc3321f135cc6ee0325f0ec443 /OpenSim/Region/Environment/Scenes | |
parent | *Standardized the Land module by removing all references to libsecondlife.pac... (diff) | |
download | opensim-SC_OLD-60a83574f41f964dc2058c80c987045db97421f7.zip opensim-SC_OLD-60a83574f41f964dc2058c80c987045db97421f7.tar.gz opensim-SC_OLD-60a83574f41f964dc2058c80c987045db97421f7.tar.bz2 opensim-SC_OLD-60a83574f41f964dc2058c80c987045db97421f7.tar.xz |
* Just some tidy up and documentation before I make my first ever attempt to extract a lump of code out to a region module
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 33a9102..f861361 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -101,9 +101,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
101 | protected BaseHttpServer m_httpListener; | 101 | protected BaseHttpServer m_httpListener; |
102 | 102 | ||
103 | protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>(); | 103 | protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>(); |
104 | public Dictionary<Type, object> ModuleInterfaces = new Dictionary<Type, object>(); | 104 | protected Dictionary<Type, object> ModuleInterfaces = new Dictionary<Type, object>(); |
105 | protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>(); | 105 | protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>(); |
106 | public Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>(); | 106 | protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>(); |
107 | 107 | ||
108 | //API module interfaces | 108 | //API module interfaces |
109 | 109 | ||
@@ -142,8 +142,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
142 | private bool m_physics_enabled = true; | 142 | private bool m_physics_enabled = true; |
143 | private bool m_scripts_enabled = true; | 143 | private bool m_scripts_enabled = true; |
144 | 144 | ||
145 | |||
146 | |||
147 | #endregion | 145 | #endregion |
148 | 146 | ||
149 | #region Properties | 147 | #region Properties |
@@ -1618,16 +1616,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
1618 | LLVector3 homePostion = new LLVector3(UserProfile.HomeLocationX,UserProfile.HomeLocationY,UserProfile.HomeLocationZ); | 1616 | LLVector3 homePostion = new LLVector3(UserProfile.HomeLocationX,UserProfile.HomeLocationY,UserProfile.HomeLocationZ); |
1619 | LLVector3 homeLookat = new LLVector3(UserProfile.HomeLookAt); | 1617 | LLVector3 homeLookat = new LLVector3(UserProfile.HomeLookAt); |
1620 | RequestTeleportLocation(client, homeRegion, homePostion,homeLookat,(uint)0); | 1618 | RequestTeleportLocation(client, homeRegion, homePostion,homeLookat,(uint)0); |
1621 | |||
1622 | } | 1619 | } |
1623 | |||
1624 | |||
1625 | } | 1620 | } |
1621 | |||
1626 | public void doObjectDuplicateOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID, | 1622 | public void doObjectDuplicateOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID, |
1627 | LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart, | 1623 | LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart, |
1628 | bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) | 1624 | bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) |
1629 | { | 1625 | { |
1630 | |||
1631 | LLVector3 pos; | 1626 | LLVector3 pos; |
1632 | const bool frontFacesOnly = true; | 1627 | const bool frontFacesOnly = true; |
1633 | 1628 | ||
@@ -1639,9 +1634,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1639 | 1634 | ||
1640 | LLVector3 direction = LLVector3.Norm(RayEnd - RayStart); | 1635 | LLVector3 direction = LLVector3.Norm(RayEnd - RayStart); |
1641 | Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z); | 1636 | Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z); |
1642 | Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z); | 1637 | Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z); |
1643 | |||
1644 | |||
1645 | 1638 | ||
1646 | if (target2.ParentGroup != null) | 1639 | if (target2.ParentGroup != null) |
1647 | { | 1640 | { |
@@ -1739,8 +1732,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1739 | { | 1732 | { |
1740 | remoteClient.SendAgentAlertMessage("Set Home request Failed",false); | 1733 | remoteClient.SendAgentAlertMessage("Set Home request Failed",false); |
1741 | } | 1734 | } |
1742 | |||
1743 | } | 1735 | } |
1736 | |||
1744 | protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) | 1737 | protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) |
1745 | { | 1738 | { |
1746 | AvatarAppearance appearance; | 1739 | AvatarAppearance appearance; |
@@ -1756,7 +1749,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1756 | return avatar; | 1749 | return avatar; |
1757 | } | 1750 | } |
1758 | 1751 | ||
1759 | |||
1760 | protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) | 1752 | protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) |
1761 | { | 1753 | { |
1762 | if (m_AvatarFactory == null || | 1754 | if (m_AvatarFactory == null || |
@@ -2294,7 +2286,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
2294 | } | 2286 | } |
2295 | 2287 | ||
2296 | /// <summary> | 2288 | /// <summary> |
2297 | /// | 2289 | /// Register an interface to a region module. This allows module methods to be called directly as |
2290 | /// well as via events. If there is already a module registered for this interface, it is not replaced | ||
2291 | /// (is this the best behaviour?) | ||
2298 | /// </summary> | 2292 | /// </summary> |
2299 | /// <param name="mod"></param> | 2293 | /// <param name="mod"></param> |
2300 | public void RegisterModuleInterface<M>(M mod) | 2294 | public void RegisterModuleInterface<M>(M mod) |
@@ -2306,9 +2300,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
2306 | } | 2300 | } |
2307 | 2301 | ||
2308 | /// <summary> | 2302 | /// <summary> |
2309 | /// | 2303 | /// For the given interface, retrieve the region module which implements it. |
2310 | /// </summary> | 2304 | /// </summary> |
2311 | /// <returns></returns> | 2305 | /// <returns>null if there is no module implementing that interface</returns> |
2312 | public T RequestModuleInterface<T>() | 2306 | public T RequestModuleInterface<T>() |
2313 | { | 2307 | { |
2314 | if (ModuleInterfaces.ContainsKey(typeof(T))) | 2308 | if (ModuleInterfaces.ContainsKey(typeof(T))) |