OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix build error, (maybe) 

* Might break something..     hard to say..      0.o
0.6.0-stable
Teravus Ovares 2008-09-20 17:17:41 +00:00
parent 5a1be7835c
commit 42f04233a4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
View File

@ -552,7 +552,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
// REPLACEMENT // REPLACEMENT
responseMap["region_seed_capability"] = LLSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); 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/rez"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath);
responseMap["rez_avatar/derez"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + derezAvatarPath); responseMap["rez_avatar/derez"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + derezAvatarPath);

7
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
View File

@ -138,7 +138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
c.Data = data; c.Data = data;
vars[field.Name] = c; 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.LSLString) ||
field.FieldType == typeof(LSL_Types.LSLFloat) || field.FieldType == typeof(LSL_Types.LSLFloat) ||
field.FieldType == typeof(Int32) || field.FieldType == typeof(Int32) ||
@ -146,7 +146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
field.FieldType == typeof(Single) || field.FieldType == typeof(Single) ||
field.FieldType == typeof(String) || field.FieldType == typeof(String) ||
field.FieldType == typeof(Byte) || field.FieldType == typeof(Byte) ||
field.FieldType == typeof(Short)) field.FieldType == typeof(short))
{ {
vars[field.Name] = field.GetValue(this); vars[field.Name] = field.GetValue(this);
} }
@ -159,6 +159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{ {
foreach (KeyValuePair<string, object> var in vars) foreach (KeyValuePair<string, object> var in vars)
{ {
FieldInfo field = (FieldInfo)var.Value;
if (m_Fields.ContainsKey(var.Key)) if (m_Fields.ContainsKey(var.Key))
{ {
if (m_Fields[var.Key].FieldType == typeof(LSL_Types.list)) 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(Single) ||
field.FieldType == typeof(String) || field.FieldType == typeof(String) ||
field.FieldType == typeof(Byte) || field.FieldType == typeof(Byte) ||
field.FieldType == typeof(Short)) field.FieldType == typeof(short))
{ {
m_Fields[var.Key].SetValue(this, var.Value); m_Fields[var.Key].SetValue(this, var.Value);
} }