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

Merge branch 'master' into UICleanup

Browse Source 
Conflicts:
	indra/llcommon/llstl.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llfloateranimpreview.cpp
	indra/newview/llfloateranimpreview.h
	indra/newview/llfloaterperms.cpp
	indra/newview/llfloaterproperties.cpp
	indra/newview/llpanelpermissions.cpp
	indra/newview/llviewermenu.cpp
This commit is contained in:
Shyotl
2013-05-03 21:41:51 -05:00
parent 525f3c6a1d 532fc68657
commit e8ce35ebf8
210 changed files with 10451 additions and 6643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llcommon/llstl.h
View File

@@ -180,7 +180,6 @@ template <typename T>
//Singu note: This has been generalized to support a broader range of map-esque containers
inline bool is_in_map(const T& inmap, typename const T::key_type& key)
{
typedef typename T::const_iterator map_iter;
if(inmap.find(key) == inmap.end())
{
return false;