Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open sim patch #78

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Open sim patch #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c686c7
Update Preferences.lsl
DoomRater Jun 13, 2015
dea3b92
Update menu.lsl
DoomRater Jun 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions Preferences.lsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ DialogPlus(string msg, list buttons, integer CurMenu, key id) {
}

if((Nbuttons = (llList2List(buttons, (CurMenu * 9), ((CurMenu * 9) + 8)) + ["<--BACK", "<--PREV", "NEXT-->"])) == ["<--BACK", "<--PREV", "NEXT-->"]) {
DialogPlus(msg, lbut, g_currCount = 0, id);
g_currCount = 0;
DialogPlus(msg, lbut, g_currCount, id);
}
else {
offerMenu(id, msg, order_buttons(Nbuttons));
Expand All @@ -189,10 +190,12 @@ DialogPlus(string msg, list buttons, integer CurMenu, key id) {
//This function determines which page needs to be generated
handlePrev(key id) {
if(g_currMenu == "Skins") {
DialogPlus(m_skinMenu(), g_Skins, --g_currCount, id);
g_currCount--;
DialogPlus(m_skinMenu(), g_Skins, g_currCount, id);
}
else if(g_currMenu == "Printouts") {
DialogPlus(m_printMenu(),g_Printouts, --g_currCount, id);
g_currCount--;
DialogPlus(m_printMenu(),g_Printouts, g_currCount, id);
}
//handling for Kawaii Diapers
else if(g_currMenu == "Diaper❤Print") {
Expand Down Expand Up @@ -665,27 +668,27 @@ default {
else if(msg=="DEBUG") {
printDebugSettings();
}
else if(~llListFindList(g_Skins, [msg]) && g_currMenu == "Diaper❤Print") {
else if((~llListFindList(g_Skins, [msg])) && g_currMenu == "Diaper❤Print") {
applyTexture(msg, "SKIN:");
offerMenu(id, g_currMenuMessage, g_currMenuButtons);
}
else if(~llListFindList(g_Panels, [msg]) && g_currMenu == "Panel") {
else if((~llListFindList(g_Panels, [msg])) && g_currMenu == "Panel") {
applyTexture(msg, "PANEL:");
offerMenu(id, g_currMenuMessage, g_currMenuButtons);
}
else if(~llListFindList(g_Tapes, [msg]) && g_currMenu == "Tapes") {
else if((~llListFindList(g_Tapes, [msg])) && g_currMenu == "Tapes") {
applyTexture(msg, "TAPE:");
offerMenu(id, g_currMenuMessage, g_currMenuButtons);
}
else if(~llListFindList(g_BackFaces, [msg]) && g_currMenu == "Back❤Face") {
else if((~llListFindList(g_BackFaces, [msg])) && g_currMenu == "Back❤Face") {
applyTexture(msg, "BACKFACE:");
offerMenu(id, g_currMenuMessage, g_currMenuButtons);
}
else if(~llListFindList(g_Cuties, [msg]) && g_currMenu == "Cutie*Mark") {
else if((~llListFindList(g_Cuties, [msg])) && g_currMenu == "Cutie*Mark") {
applyTexture(msg, "CUTIE:");
offerMenu(id, g_currMenuMessage, g_currMenuButtons);
}
else if(~llListFindList(g_Printouts, [msg]) && g_currMenu == "Printouts") {// new printout notecard!
else if((~llListFindList(g_Printouts, [msg])) && g_currMenu == "Printouts") {// new printout notecard!
llMessageLinked(LINK_THIS, -3, g_currMenu + ":" + msg, NULL_KEY);
offerMenu(id, g_currMenuMessage, g_currMenuButtons);
}
Expand Down Expand Up @@ -791,7 +794,8 @@ default {
else if(msg == "Skins" || msg == "Diaper❤Print") {
g_currMenu = msg;
if(g_diaperType == "ABARSculpt" || msg == "Diaper❤Print") {
DialogPlus(m_skinMenu(), g_Skins, g_currCount = 0, id);
g_currCount = 0;
DialogPlus(m_skinMenu(), g_Skins, g_currCount, id);
}
else if(g_diaperType == "Fluffems" || g_diaperType == "Kawaii") {
//this diaper can use tapes, panels, and the like, so show the skin menu instead
Expand All @@ -800,19 +804,23 @@ default {
}
else if(msg == "Tapes") {
g_currMenu = msg;
DialogPlus(m_tapesMenu(), g_Tapes, g_currCount = 0, id);
g_currCount = 0;
DialogPlus(m_tapesMenu(), g_Tapes, g_currCount, id);
}
else if(msg == "Panel") {
g_currMenu = msg;
DialogPlus(m_panelMenu(), g_Panels, g_currCount = 0, id);
g_currCount = 0;
DialogPlus(m_panelMenu(), g_Panels, g_currCount, id);
}
else if(msg == "Back❤Face") {
g_currMenu = msg;
DialogPlus(m_backFaceMenu(), g_BackFaces, g_currCount = 0, id);
g_currCount = 0;
DialogPlus(m_backFaceMenu(), g_BackFaces, g_currCount, id);
}
else if(msg == "Cutie*Mark") {
g_currMenu = msg;
DialogPlus(m_cutieMenu(), g_Cuties, g_currCount = 0, id);
g_currCount = 0;
DialogPlus(m_cutieMenu(), g_Cuties, g_currCount, id);
}
else if(msg == "Help") {
llOwnerSay("Adding your own skins and notecards is easy! Just prefix your textures with the appropriate tag for where you want it to be and drag it into the diaper! I'll take care of the rest.");
Expand Down Expand Up @@ -852,7 +860,8 @@ default {
}
else if(msg == "Printouts") {
g_currMenu = msg;
DialogPlus(m_printMenu(), g_Printouts, g_currCount = 0, id);
g_currCount = 0;
DialogPlus(m_printMenu(), g_Printouts, g_currCount, id);
}
else if(msg == "Plastic❤Pants") {
g_currMenu = msg;
Expand Down
8 changes: 4 additions & 4 deletions menu.lsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ default {
}
g_newCarer = "";
}
else if(~llListFindList(g_ButtonizedAvatars,[msg]) && userRank == 0) { //Start of Caretaker handling
else if((~llListFindList(g_ButtonizedAvatars,[msg])) && userRank == 0) { //Start of Caretaker handling
if(g_addRemove == 1) { //Adding a carer
integer temp = llListFindList(g_ButtonizedAvatars,[msg]);
g_newCarer = llList2String(g_detectedAvatars,temp);
Expand All @@ -832,7 +832,7 @@ default {
}

}
else if(~llListFindList(g_ButtonCarers,[msg]) && userRank == 0) {
else if((~llListFindList(g_ButtonCarers,[msg])) && userRank == 0) {
if(g_addRemove == 0) {// Deleting a carer
removeCarer(msg);
g_addRemove = -1;
Expand Down Expand Up @@ -1067,8 +1067,8 @@ default {
if(num <= 5 && num > 0) { // Carer List or a "List is Full" Message
if(msg != "I'm sorry! There is no more room for carers, please delete one.") { // Valid send
if(msg != "") {
list temp = llCSV2List(msg);
g_Carers += temp;
list tempList = llCSV2List(msg);
g_Carers += tempList;
makeButtonsForCarers();
}
}
Expand Down