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

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

Browse Source 
Conflicts(Actually git being dumb, I already merged these, just lost history):
	indra/newview/llfloateractivespeakers.h - local
	indra/newview/lloverlaybar.cpp - local
	indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote
This commit is contained in:
Lirusaito
2013-06-25 19:37:50 -04:00
parent 306df58793 2793ca9e04
commit c2cc398339
16 changed files with 284 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llviewermenu.cpp
View File

@@ -3356,15 +3356,6 @@ class LLAvatarGiveCard : public view_listener_t
}
};
void login_done(S32 which, void *user)
{
llinfos << "Login done " << which << llendl;
LLPanelLogin::close();
}
bool callback_leave_group(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotification::getSelectedOption(notification, response);