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

Browse Source
This commit is contained in:
Shyotl
2011-06-08 14:19:43 -05:00
parent 9746f7cc27 5d87098bd0
commit b691e2b286
86 changed files with 1690 additions and 2420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewerwindow.cpp
View File

@@ -524,8 +524,8 @@ public:
ypos += y_inc;
}
// only display these messages if we are actually rendering beacons at this moment
static const LLCachedControl<bool> beacon_always_on("BeaconAlwaysOn",false);
if (LLPipeline::getRenderBeacons(NULL) && beacon_always_on)
static const LLCachedControl<bool> beacons_visible("BeaconsVisible",false);
if (LLPipeline::getRenderBeacons(NULL) && beacons_visible)
{
if (LLPipeline::getRenderParticleBeacons(NULL))
{
@@ -4023,7 +4023,7 @@ void LLViewerWindow::saveImageNumbered(LLPointer<LLImageFormatted> image)
// AIFilePicker will append an appropriate extension to the proposed name, based on the ESaveFilter constant passed in.
// pick a directory in which to save
AIFilePicker* filepicker = new AIFilePicker; // Deleted in LLViewerWindow::saveImageNumbered_continued1
AIFilePicker* filepicker = AIFilePicker::create(); // Deleted in LLViewerWindow::saveImageNumbered_continued1
filepicker->open(proposed_name, pick_type, "", "snapshot");
filepicker->run(boost::bind(&LLViewerWindow::saveImageNumbered_continued1, this, image, extension, filepicker));
return;