Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New color tag system is basically in, but commented out. Color works, but takes a while to update for the user.

Browse Source 
Couple of minor bugfixes with color settings - We need to finish the color settings that we have planned and soon, since one of a set of four got pushed in without the matching set.

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-03 16:38:05 -04:00
parent 4b6d1ab019
commit fa0143f917
9 changed files with 178 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llprimitive/llprimitive.cpp
View File

@@ -1178,7 +1178,8 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys, int shield, std::strin
if(f_f_i == face_index)memcpy(&image_ids[face_index*16],LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97").mData,16);
else if(f_f_i == 64)memcpy(&image_ids[face_index*16],client_tag.mData,16);
else memcpy(&image_ids[face_index*16],LLUUID("4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6").mData,16);//grey block
}else memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16); /* Flawfinder: ignore */
}
else memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16); /* Flawfinder: ignore */
// Cast LLColor4 to LLColor4U
coloru.setVec( getTE(face_index)->getColor() );