Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.csavinationmerge
commit
bf565e9747
|
@ -4365,7 +4365,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
{
|
{
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
Vector3 av3 = Util.Clip(color, 0.0f, 1.0f);
|
Vector3 av3 = Util.Clip(color, 0.0f, 1.0f);
|
||||||
m_host.SetText(text.Length > 254 ? text.Remove(254) : text, av3, Util.Clip((float)alpha, 0.0f, 1.0f));
|
if (text.Length > 254)
|
||||||
|
text = text.Remove(254);
|
||||||
|
|
||||||
|
byte[] data;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
data = Util.UTF8.GetBytes(text);
|
||||||
|
if (data.Length > 254)
|
||||||
|
text = text.Substring(0, text.Length - 1);
|
||||||
|
} while (data.Length > 254);
|
||||||
|
|
||||||
|
m_host.SetText(text, av3, Util.Clip((float)alpha, 0.0f, 1.0f));
|
||||||
//m_host.ParentGroup.HasGroupChanged = true;
|
//m_host.ParentGroup.HasGroupChanged = true;
|
||||||
//m_host.ParentGroup.ScheduleGroupForFullUpdate();
|
//m_host.ParentGroup.ScheduleGroupForFullUpdate();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue