Merge branch 'master' into mantis5110
commit
07db35697b
|
@ -1426,7 +1426,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
|
||||||
|
|
||||||
reader.ReadStartElement(name);
|
reader.ReadStartElement(name);
|
||||||
vec.X = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // X or x
|
vec.X = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // X or x
|
||||||
vec.Y = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Y or Y
|
vec.Y = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Y or y
|
||||||
vec.Z = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Z or z
|
vec.Z = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Z or z
|
||||||
reader.ReadEndElement();
|
reader.ReadEndElement();
|
||||||
|
|
||||||
|
@ -1501,15 +1501,28 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
|
||||||
|
|
||||||
reader.ReadStartElement(name, String.Empty); // Shape
|
reader.ReadStartElement(name, String.Empty); // Shape
|
||||||
|
|
||||||
|
string nodeName = string.Empty;
|
||||||
while (reader.NodeType != XmlNodeType.EndElement)
|
while (reader.NodeType != XmlNodeType.EndElement)
|
||||||
{
|
{
|
||||||
|
nodeName = reader.Name;
|
||||||
//m_log.DebugFormat("[XXX] Processing: {0}", reader.Name);
|
//m_log.DebugFormat("[XXX] Processing: {0}", reader.Name);
|
||||||
ShapeXmlProcessor p = null;
|
ShapeXmlProcessor p = null;
|
||||||
if (m_ShapeXmlProcessors.TryGetValue(reader.Name, out p))
|
if (m_ShapeXmlProcessors.TryGetValue(reader.Name, out p))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
p(shape, reader);
|
p(shape, reader);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
m_log.DebugFormat("[SceneObjectSerializer]: exception while parsing Shape {0}: {1}", nodeName, e);
|
||||||
|
if (reader.NodeType == XmlNodeType.EndElement)
|
||||||
|
reader.Read();
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name);
|
// m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name);
|
||||||
reader.ReadOuterXml();
|
reader.ReadOuterXml();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7267,6 +7267,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
Util.Clip((float)primTextColor.z, 0.0f, 1.0f));
|
Util.Clip((float)primTextColor.z, 0.0f, 1.0f));
|
||||||
part.SetText(primText, av3, Util.Clip((float)primTextAlpha, 0.0f, 1.0f));
|
part.SetText(primText, av3, Util.Clip((float)primTextAlpha, 0.0f, 1.0f));
|
||||||
|
|
||||||
|
break;
|
||||||
|
case (int)ScriptBaseClass.PRIM_NAME:
|
||||||
|
if (remain < 1)
|
||||||
|
return;
|
||||||
|
string primName = rules.GetLSLStringItem(idx++);
|
||||||
|
part.Name = primName;
|
||||||
|
break;
|
||||||
|
case (int)ScriptBaseClass.PRIM_DESC:
|
||||||
|
if (remain < 1)
|
||||||
|
return;
|
||||||
|
string primDesc = rules.GetLSLStringItem(idx++);
|
||||||
|
part.Description = primDesc;
|
||||||
|
break;
|
||||||
|
case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
|
||||||
|
if (remain < 1)
|
||||||
|
return;
|
||||||
|
LSL_Rotation lr = rules.GetQuaternionItem(idx++);
|
||||||
|
SetRot(part, Rot2Quaternion(lr));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7813,6 +7831,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
textColor.B));
|
textColor.B));
|
||||||
res.Add(new LSL_Float(textColor.A));
|
res.Add(new LSL_Float(textColor.A));
|
||||||
break;
|
break;
|
||||||
|
case (int)ScriptBaseClass.PRIM_NAME:
|
||||||
|
res.Add(part.Name);
|
||||||
|
break;
|
||||||
|
case (int)ScriptBaseClass.PRIM_DESC:
|
||||||
|
res.Add(part.Description);
|
||||||
|
break;
|
||||||
|
case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
|
||||||
|
res.Add(new LSL_Rotation(part.RotationOffset.X, part.RotationOffset.Y, part.RotationOffset.Z, part.RotationOffset.W));
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
|
|
|
@ -316,6 +316,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
public const int PRIM_POINT_LIGHT = 23; // Huh?
|
public const int PRIM_POINT_LIGHT = 23; // Huh?
|
||||||
public const int PRIM_GLOW = 25;
|
public const int PRIM_GLOW = 25;
|
||||||
public const int PRIM_TEXT = 26;
|
public const int PRIM_TEXT = 26;
|
||||||
|
public const int PRIM_NAME = 27;
|
||||||
|
public const int PRIM_DESC = 28;
|
||||||
|
public const int PRIM_ROT_LOCAL = 29;
|
||||||
public const int PRIM_TEXGEN_DEFAULT = 0;
|
public const int PRIM_TEXGEN_DEFAULT = 0;
|
||||||
public const int PRIM_TEXGEN_PLANAR = 1;
|
public const int PRIM_TEXGEN_PLANAR = 1;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue