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

*sigh*

Browse Source
This commit is contained in:
Siana Gearz
2011-08-26 04:47:10 +02:00
parent 6b60fe40c6
commit 4c88b328be
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/settings.xml
View File

@@ -39,7 +39,7 @@
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>S32</string> <string>U32</string>
<key>Value</key> <key>Value</key>
<integer>32</integer> <integer>32</integer>
</map> </map>
@@ -50,7 +50,7 @@
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>S32</string> <string>U32</string>
<key>Value</key> <key>Value</key>
<integer>2</integer> <integer>2</integer>
</map> </map>

3
indra/newview/llhudicon.cpp
View File

@@ -334,7 +334,8 @@ LLHUDIcon* LLHUDIcon::lineSegmentIntersectAll(const LLVector3& start, const LLVe
for(icon_it = sIconInstances.begin(); icon_it != sIconInstances.end(); ++icon_it) for(icon_it = sIconInstances.begin(); icon_it != sIconInstances.end(); ++icon_it)
{ {
LLHUDIcon* icon = *icon_it; LLHUDIcon* icon = *icon_it;
if (icon && icon->lineSegmentIntersect(start, local_end, &position)) llassert(icon);
if (icon->lineSegmentIntersect(start, local_end, &position))
{ {
ret = icon; ret = icon;
if (intersection) if (intersection)