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

Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer.git into animesh

Browse Source 
# Conflicts:
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvovolume.cpp
This commit is contained in:
Shyotl
2019-04-11 02:02:05 -05:00
parent e49b484c2f 66a94c6778
commit 1351a2695e
252 changed files with 10456 additions and 5211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llvovolume.cpp
View File

@@ -4283,7 +4283,6 @@ LLVector3 LLVOVolume::volumeDirectionToAgent(const LLVector3& dir) const
return ret;
}
BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, S32 face, BOOL pick_transparent, BOOL pick_rigged, S32 *face_hitp,
LLVector4a* intersection,LLVector2* tex_coord, LLVector4a* normal, LLVector4a* tangent)
@@ -4317,7 +4316,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
transform = false;
}
else
{ //cannot pick rigged attachments on other avatars or when not in build mode
{
return FALSE;
}
}