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

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2016-06-09 21:17:43 -05:00
parent ab01a68d92 e486b9b1e8
commit f47395531f
9 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
autobuild.xml
View File

@@ -684,11 +684,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>47f5754929fed18fd5ffff8cda2d84e2</string>
<string>be09dc1f144c936790236b94190815b4</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/linux64/lib-trusty/fmodstudio-1.08.00-linux64-201603232053.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/linux64/lib/fmodstudio-1.08.04-linux64-201605301500.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -698,11 +698,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>4b307f5f2a8536b27a090301b0200805</string>
<string>fe50f650c97e6350bedfd90102d3321f</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows/lib/fmodstudio-1.08.01-windows-201604091408.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows/lib/fmodstudio-1.08.04-windows-201605291158.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -712,18 +712,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b5cbef5e8df0573a2568dffc33548852</string>
<string>13ac02d0444e46c17fa20c20a9828647</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/windows64/lib/fmodstudio-1.08.01-windows64-201604091406.tar.bz2</string>
<string>https://depot.alchemyviewer.org/pub/windows64/lib/fmodstudio-1.08.04-windows64-201605291157.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.08.01</string>
<string>1.08.04</string>
</map>
<key>fontconfig</key>
<map>

2
indra/llui/lltexteditor.cpp
View File

@@ -3028,7 +3028,7 @@ void LLTextEditor::drawSelectionBackground()
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
const LLColor4& color = mReadOnly ? mReadOnlyBgColor : mWriteableBgColor;
F32 alpha = hasFocus() ? 1.f : 0.5f;
F32 alpha = hasFocus() ? 1.f : 0.8f;
gGL.color4f( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], alpha );
S32 margin_offset = mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0;

5
indra/newview/lleventnotifier.cpp
View File

@@ -39,7 +39,7 @@
#include "llnotify.h"
#include "lleventinfo.h"
#include "llfloaterdirectory.h"
#include "llfloaterevent.h"
#include "llfloaterworldmap.h"
#include "llagent.h"
#include "llappviewer.h" // for gPacificDaylightTime
@@ -104,8 +104,7 @@ bool LLEventNotifier::handleResponse(U32 eventId, LLVector3d eventPos, const LLS
gFloaterWorldMap->trackLocation(eventPos);
break;
case 1:
gDisplayEventHack = TRUE;
LLFloaterDirectory::showEvents(eventId);
LLFloaterEventInfo::show(eventId);
break;
case 2:
break;

2
indra/newview/llfloaterdirectory.h
View File

@@ -142,6 +142,4 @@ private:
static LLFloaterDirectory *sInstance;
};
extern BOOL gDisplayEventHack;
#endif // LL_LLDIRECTORYFLOATER_H

9
indra/newview/llpaneldirevents.cpp
View File

@@ -52,8 +52,6 @@
#include "llnotificationsutil.h"
#include "llviewerregion.h"
BOOL gDisplayEventHack = FALSE;
LLPanelDirEvents::LLPanelDirEvents(const std::string& name, LLFloaterDirectory* floater)
: LLPanelDirBrowser(name, floater),
mDoneQuery(FALSE),
@@ -85,12 +83,7 @@ BOOL LLPanelDirEvents::postBuild()
mCurrentSortColumn = "time";
if (!gDisplayEventHack)
{
setDay(0); // for today
//performQuery(); // Temporary change to help DB - Sabin
}
gDisplayEventHack = FALSE;
setDay(0); // for today
LLViewerRegion* region(gAgent.getRegion());
getChildView("filter_gaming")->setVisible(region && (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_EVENTS));

2
indra/newview/llstatusbar.cpp
View File

@@ -45,6 +45,7 @@
#include "llfloaterregioninfo.h"
#include "llfloaterscriptdebug.h"
#include "llfloatersearch.h"
#include "llfloaterstats.h"
#include "llhudicon.h"
#include "llkeyboard.h"
#include "lllineeditor.h"
@@ -275,6 +276,7 @@ mIsNavMeshDirty(false)
addChild(mSGPacketLoss);
mStatBtn = getChild<LLTextBox>("stat_btn");
mStatBtn->setClickedCallback(boost::bind(LLFloaterStats::toggleInstance, LLSD()));
}
LLStatusBar::~LLStatusBar()

1
indra/newview/llviewerregion.cpp
View File

@@ -1889,6 +1889,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
capabilityNames.append("AgentState");
capabilityNames.append("AttachmentResources");
//capabilityNames.append("AvatarPickerSearch"); //Display name/SLID lookup (llfloateravatarpicker.cpp)
capabilityNames.append("AvatarRenderInfo");
capabilityNames.append("CharacterProperties");
capabilityNames.append("ChatSessionRequest");
capabilityNames.append("CopyInventoryFromNotecard");

2
indra/newview/skins/default/xui/en-us/panel_media_controls.xml
View File

@@ -42,7 +42,7 @@
image_disabled="flyout_btn_left_disabled.tga"
label="" left_delta="21"
mouse_opaque="true" name="media_play" scale_image="true" toggle="false"
tool_tip="Play/pause streaming music" width="20" />
tool_tip="Play/pause streaming media" width="20" />
<button bottom="-21" enabled="false" follows="left|top" height="20"
image_overlay="icn_pause.tga"
image_unselected="flyout_btn_left.tga"

53
indra/newview/viewer_manifest.py
View File

@@ -915,6 +915,19 @@ class DarwinManifest(ViewerManifest):
self.remove(sparsename)
class LinuxManifest(ViewerManifest):
def is_packaging_viewer(self):
super(LinuxManifest, self).is_packaging_viewer()
return True # We always want a packaged viewer even without archive.
def do(self, *actions):
super(LinuxManifest, self).do(*actions)
if not 'package' in self.actions:
self.package_finish() # Always finish the package.
else:
# package_finish() was called by super.do() so just create the TAR.
self.create_archive()
return self.file_list
def construct(self):
import shutil
shutil.rmtree("./packaged/app_settings/shaders", ignore_errors=True);
@@ -1049,12 +1062,8 @@ class LinuxManifest(ViewerManifest):
self.path("featuretable_linux.txt")
def package_finish(self):
installer_name = self.installer_base_name()
self.strip_binaries()
# Fix access permissions
self.run_command("""
find %(dst)s -type d | xargs --no-run-if-empty chmod 755;
@@ -1063,37 +1072,33 @@ class LinuxManifest(ViewerManifest):
find %(dst)s -type f -perm 0600 | xargs --no-run-if-empty chmod 0644;
find %(dst)s -type f -perm 0400 | xargs --no-run-if-empty chmod 0444;
true""" % {'dst':self.get_dst_prefix() })
self.package_file = installer_name + '.tar.xz'
def strip_binaries(self):
print "* Going strip-crazy on the packaged binaries"
# makes some small assumptions about our packaged dir structure
self.run_command(r"find %(d)r/lib %(d)r/lib32 %(d)r/lib64 -type f \! -name update_install | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} )
self.run_command(r"find %(d)r/bin -executable -type f \! -name update_install | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} )
def create_archive(self):
installer_name = self.installer_base_name()
# temporarily move directory tree so that it has the right
# name in the tarfile
self.run_command("mv %(dst)s %(inst)s" % {
'dst': self.get_dst_prefix(),
'inst': self.build_path_of(installer_name)})
try:
# only create tarball if it's a release build.
if self.args['buildtype'].lower() == 'release':
# --numeric-owner hides the username of the builder for
# security etc.
self.run_command('tar -C %(dir)s --numeric-owner -cJf '
'%(inst_path)s.tar.xz %(inst_name)s' % {
'dir': self.get_build_prefix(),
'inst_name': installer_name,
'inst_path':self.build_path_of(installer_name)})
else:
print "Skipping %s.tar.xz for non-Release build (%s)" % \
(installer_name, self.args['buildtype'])
# --numeric-owner hides the username of the builder for
# security etc.
self.run_command('tar -C %(dir)s --numeric-owner -cJf '
'%(inst_path)s.tar.xz %(inst_name)s' % {
'dir': self.get_build_prefix(),
'inst_name': installer_name,
'inst_path':self.build_path_of(installer_name)})
finally:
self.run_command("mv %(inst)s %(dst)s" % {
'dst': self.get_dst_prefix(),
'inst': self.build_path_of(installer_name)})
def strip_binaries(self):
if self.args['buildtype'].lower() == 'release' and self.is_packaging_viewer():
print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build"
# makes some small assumptions about our packaged dir structure
self.run_command(r"find %(d)r/lib %(d)r/lib32 %(d)r/lib64 -type f \! -name update_install | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} )
self.run_command(r"find %(d)r/bin -executable -type f \! -name update_install | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} )
self.package_file = installer_name + '.tar.xz'
class Linux_i686_Manifest(LinuxManifest):