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

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source
This commit is contained in:
CharleyLevenque
2010-08-30 01:49:39 -04:00
parent b156e57541 f0a2b9db11
commit f19f7a07ba
15 changed files with 8717 additions and 8527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llviewermenu.cpp
View File

@@ -112,7 +112,8 @@
#include "llfloaterchat.h"
#include "llfloatercustomize.h"
#include "llfloaterdaycycle.h"
#include "llfloaterdickdongs.h"
//#include "llfloaterdickdongs.h" No need for the custom floater right now, I think. -HgB
#include "ascentuploadbrowser.h" //New customer floater attempts
#include "llfloaterdirectory.h"
#include "llfloatereditui.h"
#include "llfloaterchatterbox.h"
@@ -6110,17 +6111,17 @@ class LLShowFloater : public view_listener_t
{
LLFloaterActiveSpeakers::toggleInstance(LLSD());
}
else if (floater_name == "beacons")
/*else if (floater_name == "beacons")
{
LLFloaterBeacons::toggleInstance(LLSD());
}
LLFloaterBeacons::toggleInstance(LLSD()); NO
}*/
else if (floater_name == "perm prefs")
{
LLFloaterPerms::toggleInstance(LLSD());
}
else if (floater_name == "dickdongs")
else if (floater_name == "ascentuploadbrowser")
{
LLFloaterDickDongs::toggleInstance(LLSD());
ASFloaterUploadBrowser::show(NULL);
}
return true;
}
@@ -6177,14 +6178,14 @@ class LLFloaterVisible : public view_listener_t
{
new_value = LLFloaterActiveSpeakers::instanceVisible(LLSD());
}
else if (floater_name == "beacons")
/*else if (floater_name == "beacons")
{
new_value = LLFloaterBeacons::instanceVisible(LLSD());
new_value = LLFloaterBeacons::instanceVisible(LLSD()); Oh man fuck this floater so much.
}
else if (floater_name == "dickdongs")
{
new_value = LLFloaterDickDongs::instanceVisible(LLSD());
}
new_value = LLFloaterDickDongs::instanceVisible(LLSD()); Not needed any more.
}*/
else if (floater_name == "inventory")
{
LLInventoryView* iv = LLInventoryView::getActiveInventory();