diff options
author | Dalien Talbot | 2007-11-11 22:23:34 +0000 |
---|---|---|
committer | Dalien Talbot | 2007-11-11 22:23:34 +0000 |
commit | 8039c31e88fff3fb5edb57ebaa164d3d20e4b939 (patch) | |
tree | 43112538aa9f1873a4b294a1854b55c1c675af20 /OpenSim/Region/ClientStack | |
parent | Fixing null pointer exception from Mathias Soeken: (diff) | |
download | opensim-SC-8039c31e88fff3fb5edb57ebaa164d3d20e4b939.zip opensim-SC-8039c31e88fff3fb5edb57ebaa164d3d20e4b939.tar.gz opensim-SC-8039c31e88fff3fb5edb57ebaa164d3d20e4b939.tar.bz2 opensim-SC-8039c31e88fff3fb5edb57ebaa164d3d20e4b939.tar.xz |
Patch from Mathias Soeken (thanks Mathias!) to take care of the color
and alpha argument of the llSetText command.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index c8213fc..b52a834 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -1023,7 +1023,7 @@ namespace OpenSim.Region.ClientStack | |||
1023 | public void SendPrimitiveToClient( | 1023 | public void SendPrimitiveToClient( |
1024 | ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, | 1024 | ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, |
1025 | uint flags, | 1025 | uint flags, |
1026 | LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem, LLQuaternion rotation) | 1026 | LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, LLQuaternion rotation) |
1027 | { | 1027 | { |
1028 | ObjectUpdatePacket outPacket = new ObjectUpdatePacket(); | 1028 | ObjectUpdatePacket outPacket = new ObjectUpdatePacket(); |
1029 | outPacket.RegionData.RegionHandle = regionHandle; | 1029 | outPacket.RegionData.RegionHandle = regionHandle; |
@@ -1036,6 +1036,10 @@ namespace OpenSim.Region.ClientStack | |||
1036 | outPacket.ObjectData[0].FullID = objectID; | 1036 | outPacket.ObjectData[0].FullID = objectID; |
1037 | outPacket.ObjectData[0].OwnerID = ownerID; | 1037 | outPacket.ObjectData[0].OwnerID = ownerID; |
1038 | outPacket.ObjectData[0].Text = Helpers.StringToField(text); | 1038 | outPacket.ObjectData[0].Text = Helpers.StringToField(text); |
1039 | outPacket.ObjectData[0].TextColor[0] = color[0]; | ||
1040 | outPacket.ObjectData[0].TextColor[1] = color[1]; | ||
1041 | outPacket.ObjectData[0].TextColor[2] = color[2]; | ||
1042 | outPacket.ObjectData[0].TextColor[3] = color[3]; | ||
1039 | outPacket.ObjectData[0].ParentID = parentID; | 1043 | outPacket.ObjectData[0].ParentID = parentID; |
1040 | outPacket.ObjectData[0].PSBlock = particleSystem; | 1044 | outPacket.ObjectData[0].PSBlock = particleSystem; |
1041 | outPacket.ObjectData[0].ClickAction = 0; | 1045 | outPacket.ObjectData[0].ClickAction = 0; |