livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with viewer64.

master
Nicky 2017-06-19 02:41:18 +02:00
parent 58bfdbefc8 124d8c8dce
commit 09e93a28ca
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autobuild.xml
View File

@ -769,9 +769,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>da5c705fa4fae169cba26fba92dba1ef</string>
<string>95a6d7d1ff2ffc8679601d9408533663</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4835/15404/dullahan-1.1.800_3.3029.1611.g44e39a8-darwin64-504824.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6185/21567/dullahan-1.1.800_3.3071.1637.gcb6cf75-darwin64-506174.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -781,9 +781,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>17cd8f6e8f95df877d0c9c234f860324</string>
<string>c14caa52a6ab343c35e6e76af840257f</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4836/15410/dullahan-1.1.800_3.3029.1611.g44e39a8-windows-504824.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6187/21579/dullahan-1.1.800_3.3071.1634.g9cc59c8-windows-506174.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -793,9 +793,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>7a478f8f0e13f5f81cab657a8c351186</string>
<string>ff4d59eb23011198ccd0aa4f5875bbd1</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4837/15415/dullahan-1.1.800_3.3029.1611.g44e39a8-windows64-504824.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6186/21573/dullahan-1.1.800_3.3071.1634.g9cc59c8-windows64-506174.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@ -826,7 +826,7 @@
</map>
</map>
<key>version</key>
<string>1.1.800_3.3029.1611.g44e39a8</string>
<string>1.1.800_3.3071.1634.g9cc59c8</string>
</map>
<key>elfio</key>
<map>

16
indra/newview/llviewerobject.cpp
View File

@ -6382,20 +6382,20 @@ BOOL LLViewerObject::isTempAttachment() const
BOOL LLViewerObject::isHiglightedOrBeacon() const
{
// <FS:Ansariel> We can render beacons even if the floater is not visible
//if (LLFloaterReg::instanceVisible("beacons") && (gPipeline.getRenderBeacons(NULL) || gPipeline.getRenderHighlights(NULL)))
if (gPipeline.getRenderBeacons(NULL) || gPipeline.getRenderHighlights(NULL))
//if (LLFloaterReg::instanceVisible("beacons") && (gPipeline.getRenderBeacons() || gPipeline.getRenderHighlights()))
if (gPipeline.getRenderBeacons() || gPipeline.getRenderHighlights())
// </FS:Ansariel>
{
BOOL has_media = (getMediaType() == LLViewerObject::MEDIA_SET);
BOOL is_scripted = !isAvatar() && !getParent() && flagScripted();
BOOL is_physical = !isAvatar() && flagUsePhysics();
return (isParticleSource() && gPipeline.getRenderParticleBeacons(NULL))
|| (isAudioSource() && gPipeline.getRenderSoundBeacons(NULL))
|| (has_media && gPipeline.getRenderMOAPBeacons(NULL))
|| (is_scripted && gPipeline.getRenderScriptedBeacons(NULL))
|| (is_scripted && flagHandleTouch() && gPipeline.getRenderScriptedTouchBeacons(NULL))
|| (is_physical && gPipeline.getRenderPhysicalBeacons(NULL));
return (isParticleSource() && gPipeline.getRenderParticleBeacons())
|| (isAudioSource() && gPipeline.getRenderSoundBeacons())
|| (has_media && gPipeline.getRenderMOAPBeacons())
|| (is_scripted && gPipeline.getRenderScriptedBeacons())
|| (is_scripted && flagHandleTouch() && gPipeline.getRenderScriptedTouchBeacons())
|| (is_physical && gPipeline.getRenderPhysicalBeacons());
}
return FALSE;
}