From 42f04233a4a8c684c8266800cb2b661ea29973a9 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 20 Sep 2008 17:17:41 +0000 Subject: [PATCH] * Fix build error, (maybe) * Might break something.. hard to say.. 0.o --- .../Modules/InterGrid/OpenGridProtocolModule.cs | 2 +- .../Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index dfa751c20f..b32985a859 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs @@ -552,7 +552,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid // REPLACEMENT responseMap["region_seed_capability"] = LLSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); - + responseMap["rez_avatar"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); responseMap["rez_avatar/rez"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); responseMap["rez_avatar/derez"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + derezAvatarPath); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs index b32fce65cc..25f654eefa 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs @@ -138,7 +138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase c.Data = data; vars[field.Name] = c; } - else if(field.FieldType == typeof(LSL_Types.LSLInteger) || + else if (field.FieldType == typeof(LSL_Types.LSLInteger) || field.FieldType == typeof(LSL_Types.LSLString) || field.FieldType == typeof(LSL_Types.LSLFloat) || field.FieldType == typeof(Int32) || @@ -146,7 +146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase field.FieldType == typeof(Single) || field.FieldType == typeof(String) || field.FieldType == typeof(Byte) || - field.FieldType == typeof(Short)) + field.FieldType == typeof(short)) { vars[field.Name] = field.GetValue(this); } @@ -159,6 +159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { foreach (KeyValuePair var in vars) { + FieldInfo field = (FieldInfo)var.Value; if (m_Fields.ContainsKey(var.Key)) { if (m_Fields[var.Key].FieldType == typeof(LSL_Types.list)) @@ -177,7 +178,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase field.FieldType == typeof(Single) || field.FieldType == typeof(String) || field.FieldType == typeof(Byte) || - field.FieldType == typeof(Short)) + field.FieldType == typeof(short)) { m_Fields[var.Key].SetValue(this, var.Value); }