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

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

Browse Source 
Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp
This commit is contained in:
Shyotl
2012-11-29 11:54:41 -06:00
parent 3a4b6cf6b6 e17405d80a
commit 794dbacea3
358 changed files with 27109 additions and 8865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llviewermenu.cpp
View File

@@ -139,6 +139,7 @@
#include "llfloatermute.h"
#include "llfloateropenobject.h"
#include "llfloateroutbox.h"
#include "llfloaterpermissionsmgr.h"
#include "llfloaterperms.h"
#include "llfloaterpostprocess.h"
@@ -249,6 +250,7 @@
#include "hgfloatertexteditor.h"
#include "llfloatervfs.h"
#include "llfloatervfsexplorer.h"
#include "llfloatermessagelog.h"
#include "shfloatermediaticker.h"
#include "llpacketring.h"
// </edit>
@@ -489,7 +491,7 @@ void handle_force_ground_sit(void*);
void handle_phantom_avatar(void*);
void handle_hide_typing_notification(void*);
void handle_close_all_notifications(void*);
//void handle_open_message_log(void*);
void handle_open_message_log(void*);
void handle_edit_ao(void*);
void handle_local_assets(void*);
void handle_vfs_explorer(void*);
@@ -818,7 +820,6 @@ void init_menus()
(void*)"ReSit"));
menu->addSeparator();
menu->addChild(new LLMenuItemCallGL( "Object Area Search", &handle_area_search, NULL));
//menu->addChild(new LLMenuItemCallGL( "Message Log", &handle_open_message_log, NULL));
menu->addChild(new LLMenuItemCallGL( "Sound Explorer",
&handle_sounds_explorer, NULL));
@@ -1089,6 +1090,8 @@ void init_client_menu(LLMenuGL* menu)
sub = new LLMenuGL("Network");
sub->setCanTearOff(TRUE);
sub->addChild(new LLMenuItemCallGL( "Message Log", &handle_open_message_log, NULL));
sub->addChild(new LLMenuItemCallGL("Enable Message Log",
&handle_viewer_enable_message_log, NULL));
sub->addChild(new LLMenuItemCallGL("Disable Message Log",
@@ -2647,7 +2650,7 @@ class LLPowerfulWizard : public view_listener_t
*/
LLSelectMgr::getInstance()->selectionUpdateTemporary(1);//set temp to TRUE
LLSelectMgr::getInstance()->selectionUpdatePhysics(1);
LLSelectMgr::getInstance()->sendDelink();
LLSelectMgr::getInstance()->unlinkObjects();
LLSelectMgr::getInstance()->deselectAll();
}
@@ -3656,10 +3659,10 @@ void process_grant_godlike_powers(LLMessageSystem* msg, void**)
// <edit>
/*void handle_open_message_log(void*)
void handle_open_message_log(void*)
{
LLFloaterMessageLog::show();
}*/
}
void handle_edit_ao(void*)
{
@@ -6536,6 +6539,10 @@ class LLShowFloater : public view_listener_t
{
LLFloaterPerms::toggleInstance(LLSD());
}
else if (floater_name == "outbox")
{
LLFloaterOutbox::toggleInstance(LLSD());
}
return true;
}
};
@@ -6610,6 +6617,10 @@ class LLFloaterVisible : public view_listener_t
if (!instn) new_value = false;
else new_value = instn->getVisible();
}
else if (floater_name == "outbox")
{
new_value = LLFloaterOutbox::instanceVisible(LLSD());
}
gMenuHolder->findControl(control_name)->setValue(new_value);
return true;
}