livie
/
ARES-SDK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved out color code causing problems with device display

main
Samantha Wright 2024-08-31 16:24:31 -07:00
parent de360db68d
commit 8ece750316
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ARES/system/display.lsl
View File

@ -91,6 +91,20 @@ position_all(integer only_devices) {
pixel_scale = 1.0 / screen_height; pixel_scale = 1.0 / screen_height;
} }
{
color_slot = (integer)getdbl("interface", ["color"]);
if(color_slot == 0)
color = ONES;
else
color = str2vec(getdbl("id", ["color", color_slot - 1]));
integer cbi = 2;
if(color_slot - 1== 2)
cbi = 3;
color_bad = str2vec(getdbl("id", ["color", cbi]));
}
/* DEVICES */ /* DEVICES */
#define MAX_DEVICES 16 #define MAX_DEVICES 16
// string devices = llLinksetDataRead("device"); // string devices = llLinksetDataRead("device");
@ -553,9 +567,9 @@ main(integer src, integer n, string m, key outs, key ins, key user) {
screen_height_mlook = (integer)getjs(s_interface, ["height-mlook"]); screen_height_mlook = (integer)getjs(s_interface, ["height-mlook"]);
if(!screen_height_mlook) screen_height_mlook = 1027; if(!screen_height_mlook) screen_height_mlook = 1027;
color_slot = (integer)getjs(s_interface, ["color"]); // color_slot = (integer)getjs(s_interface, ["color"]);
} }
/*
if(color_slot == 0) if(color_slot == 0)
color = ONES; color = ONES;
else else
@ -564,7 +578,7 @@ main(integer src, integer n, string m, key outs, key ins, key user) {
integer cbi = 2; integer cbi = 2;
if(color_slot - 1== 2) if(color_slot - 1== 2)
cbi = 3; cbi = 3;
color_bad = str2vec(getdbl("id", ["color", cbi])); color_bad = str2vec(getdbl("id", ["color", cbi])); */
{ {
string s_display = llLinksetDataRead("display"); string s_display = llLinksetDataRead("display");