diff options
| author | Teravus Ovares (Dan Olivares) | 2010-05-15 23:22:07 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2010-05-15 23:22:07 -0400 |
| commit | 019925bb2f87695cd16d1bebff4ef300b16e67f1 (patch) | |
| tree | b596598ebde44e1bd69c64898f4236d515303871 /OpenSim/Region/CoreModules | |
| parent | * Add User Friendly Configuration File Exists check. If OpenSim.ini and eith... (diff) | |
| parent | Almost, but not quite. Commenting verification again, until I understand wher... (diff) | |
| download | opensim-SC_OLD-019925bb2f87695cd16d1bebff4ef300b16e67f1.zip opensim-SC_OLD-019925bb2f87695cd16d1bebff4ef300b16e67f1.tar.gz opensim-SC_OLD-019925bb2f87695cd16d1bebff4ef300b16e67f1.tar.bz2 opensim-SC_OLD-019925bb2f87695cd16d1bebff4ef300b16e67f1.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index 2a1355b..a6f5d97 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |||
| @@ -107,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | Caps caps | 109 | Caps caps |
| 110 | = new Caps( | 110 | = new Caps(m_scene, |
| 111 | m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName, | 111 | m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName, |
| 112 | MainServer.Instance.Port, | 112 | MainServer.Instance.Port, |
| 113 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); | 113 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); |