ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

stop old useless bytes to float and back to bytes

Browse Source
This commit is contained in:
UbitUmarov
2025-06-04 23:41:26 +01:00
parent 74c64e199d
commit e0006fb17d
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -52,6 +52,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
using PermissionMask = OpenSim.Framework.PermissionMask;
using RegionFlags = OpenMetaverse.RegionFlags;
using System.Linq;
using System.Drawing;
namespace OpenSim.Region.ClientStack.LindenUDP
{
@@ -7544,8 +7545,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
zc.AddShortLimitedUTF8(osUTF8PartText);
//textcolor
byte[] tc = part.GetTextColor().GetBytes(false);
zc.AddBytes(tc, 4);
Color c = part.Color;
zc.AddByte(c.R);
zc.AddByte(c.G);
zc.AddByte(c.B);
zc.AddByte((byte)(0xff - c.A));
}
//media url
@@ -7965,7 +7969,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
else
BlockLengh += extraParamBytes.Length;
byte[] hoverTextColor = null;
osUTF8 osUTF8PartText = part.osUTF8Text;
if (osUTF8PartText != null && osUTF8PartText.Length > 0)
{
@@ -7973,8 +7976,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
BlockLengh += osUTF8PartText.Length;
if (osUTF8PartText[^1] != 0)
++BlockLengh;
hoverTextColor = part.GetTextColor().GetBytes(false);
BlockLengh += hoverTextColor.Length;
BlockLengh += 4;
hastext = true;
}
@@ -8102,7 +8104,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
zc.AddBytes(osUTF8PartText.GetArray(), osUTF8PartText.Length);
if (osUTF8PartText[^1] != 0)
zc.AddZeros(1);
zc.AddBytes(hoverTextColor, hoverTextColor.Length);
Color c = part.Color;
zc.AddByte(c.R);
zc.AddByte(c.G);
zc.AddByte(c.B);
zc.AddByte((byte)(0xff - c.A));
}
if (hasmediaurl)
{

3
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -5308,9 +5308,8 @@ namespace OpenSim.Region.Framework.Scenes
public Color4 GetTextColor()
{
// note that Alpha is inverted for lludp
Color color = m_color;
return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A));
return new Color4(color.R, color.G, color.B, m_color.A);
}
public float GetTextAlpha()

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -12070,7 +12070,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
res.Add(new LSL_Vector(textColor.R,
textColor.G,
textColor.B));
res.Add(new LSL_Float(part.GetTextAlpha()));
res.Add(new LSL_Float(textColor.A));
break;
case ScriptBaseClass.PRIM_NAME: