aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMW2008-03-25 18:48:07 +0000
committerMW2008-03-25 18:48:07 +0000
commitc2ea7b99e1cdbc06035e12306a71712f763b0818 (patch)
treee25876965e745f65917e7a740b2617961ee4b325 /OpenSim/Region/Environment
parent* Tear down CAPS and http handlers when an agent leaves a region (via crossin... (diff)
downloadopensim-SC_OLD-c2ea7b99e1cdbc06035e12306a71712f763b0818.zip
opensim-SC_OLD-c2ea7b99e1cdbc06035e12306a71712f763b0818.tar.gz
opensim-SC_OLD-c2ea7b99e1cdbc06035e12306a71712f763b0818.tar.bz2
opensim-SC_OLD-c2ea7b99e1cdbc06035e12306a71712f763b0818.tar.xz
Moved Avatar appearance Factory to its own project so that the reference to MySQLDatabaseMapper could be removed from Region.Environment.
Added a using OpenSim.Framework.Data statement to MySQLDatabaseMapper , to try to fix the build problem that has been reported on the mailing list.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/ModuleLoader.cs18
-rw-r--r--OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs22
4 files changed, 37 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index 4a8bf7b..7fb8d8a 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -114,15 +114,15 @@ namespace OpenSim.Region.Environment
114 m_loadedSharedModules.Add(loadMod.Name, loadMod); 114 m_loadedSharedModules.Add(loadMod.Name, loadMod);
115 } 115 }
116 116
117 AvatarFactoryModule avatarFactory = new AvatarFactoryModule(); 117 // AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
118 if (m_loadedSharedModules.ContainsKey(avatarFactory.Name)) 118 // if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
119 { 119 // {
120 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule"); 120 // m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
121 } 121 // }
122 else 122 // else
123 { 123 // {
124 m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory); 124 // m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory);
125 } 125 // }
126 126
127 XMLRPCModule xmlRpcMod = new XMLRPCModule(); 127 XMLRPCModule xmlRpcMod = new XMLRPCModule();
128 if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name)) 128 if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))
diff --git a/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs b/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
index 0dc43a6..eab6528 100644
--- a/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
+++ b/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
@@ -24,8 +24,7 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27/*using System;
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text; 29using System.Text;
31using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
@@ -34,6 +33,7 @@ using OpenSim.Framework.Data.Base;
34 33
35namespace OpenSim.Region.Environment.Modules 34namespace OpenSim.Region.Environment.Modules
36{ 35{
36 /*
37 public class AppearanceRowMapper : BaseRowMapper<AvatarAppearance> 37 public class AppearanceRowMapper : BaseRowMapper<AvatarAppearance>
38 { 38 {
39 public AppearanceRowMapper(BaseSchema schema, AvatarAppearance obj) 39 public AppearanceRowMapper(BaseSchema schema, AvatarAppearance obj)
@@ -239,4 +239,5 @@ namespace OpenSim.Region.Environment.Modules
239 } 239 }
240 } 240 }
241 } 241 }
242} 242
243}*/
diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index da33726..6758d41 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28/*
28using System; 29using System;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Threading; 31using System.Threading;
@@ -39,6 +40,7 @@ using OpenSim.Framework.Data.Base;
39 40
40namespace OpenSim.Region.Environment.Modules 41namespace OpenSim.Region.Environment.Modules
41{ 42{
43 /*
42 public class AvatarFactoryModule : IAvatarFactory 44 public class AvatarFactoryModule : IAvatarFactory
43 { 45 {
44 private Scene m_scene = null; 46 private Scene m_scene = null;
@@ -334,4 +336,4 @@ namespace OpenSim.Region.Environment.Modules
334 return visualParams; 336 return visualParams;
335 } 337 }
336 } 338 }
337} 339}*/
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f02f038..6644299 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1461,7 +1461,7 @@ namespace OpenSim.Region.Environment.Scenes
1461 m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis"); 1461 m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis");
1462 byte[] visualParams; 1462 byte[] visualParams;
1463 AvatarWearable[] wearables; 1463 AvatarWearable[] wearables;
1464 AvatarFactoryModule.GetDefaultAvatarAppearance(out wearables, out visualParams); 1464 GetDefaultAvatarAppearance(out wearables, out visualParams);
1465 appearance = new AvatarAppearance(client.AgentId, wearables, visualParams); 1465 appearance = new AvatarAppearance(client.AgentId, wearables, visualParams);
1466 } 1466 }
1467 } 1467 }
@@ -2723,5 +2723,25 @@ namespace OpenSim.Region.Environment.Scenes
2723 } 2723 }
2724 2724
2725 #endregion 2725 #endregion
2726
2727 #region Avatar Appearance Default
2728
2729 public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)
2730 {
2731 visualParams = GetDefaultVisualParams();
2732 wearables = AvatarWearable.DefaultWearables;
2733 }
2734
2735 private static byte[] GetDefaultVisualParams()
2736 {
2737 byte[] visualParams;
2738 visualParams = new byte[218];
2739 for (int i = 0; i < 218; i++)
2740 {
2741 visualParams[i] = 100;
2742 }
2743 return visualParams;
2744 }
2745 #endregion
2726 } 2746 }
2727} 2747}