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

Merge https://github.com/PlayerDagostino/SingularityViewer into future

Browse Source 
Conflicts:
	indra/llplugin/llplugininstance.cpp
	indra/llwindow/llwindowsdl.cpp
	indra/llwindow/llwindowsdl.h
	indra/newview/llpreviewnotecard.cpp
	indra/newview/llviewerwindow.h
This commit is contained in:
Siana Gearz
2011-10-03 16:10:35 +02:00
parent 74dc875a27 b65da876f7
commit 9ac2c07f52
40 changed files with 986 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llpreview.cpp
View File

@@ -47,6 +47,9 @@
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
#include "lldbstrings.h"
#include "llfloatersearchreplace.h"
#include "llpreviewnotecard.h"
#include "llpreviewscript.h"
#include "llagent.h"
#include "llvoavatarself.h"
#include "llselectmgr.h"
@@ -579,6 +582,24 @@ void LLMultiPreview::tabOpen(LLFloater* opened_floater, bool from_click)
{
opened_preview->loadAsset();
}
LLFloater* search_floater = LLFloaterSearchReplace::getInstance();
if (search_floater && search_floater->getDependee() == this)
{
LLPreviewNotecard* notecard_preview; LLPreviewLSL* script_preview;
if ((notecard_preview = dynamic_cast<LLPreviewNotecard*>(opened_preview)) != NULL)
{
LLFloaterSearchReplace::show(notecard_preview->getEditor());
}
else if ((script_preview = dynamic_cast<LLPreviewLSL*>(opened_preview)) != NULL)
{
LLFloaterSearchReplace::show(script_preview->getEditor());
}
else
{
search_floater->setVisible(FALSE);
}
}
}
//static