Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into CT3Merge

indra/newview/CMakeLists.txt

@@ -17,7 +17,7 @@ endif(FMOD)
 include(OPENAL)
 include(FindOpenGL)
 include(Hunspell)
-#include(JsonCpp)
+include(JsonCpp)
 include(LLAddBuildTest)
 include(LLAudio)
 include(LLCharacter)
@@ -370,6 +370,7 @@ set(viewer_SOURCE_FILES
     llpanelpermissions.cpp
     llpanelpick.cpp
     llpanelplace.cpp
+    llpanelprofile.cpp
     llpanelskins.cpp
     llpanelvolume.cpp
     llpanelweb.cpp
@@ -538,6 +539,7 @@ set(viewer_SOURCE_FILES
     llwearablelist.cpp
     llwearabletype.cpp
     llweb.cpp
+    llwebprofile.cpp
     llwind.cpp
     llwlanimator.cpp
     llwldaycycle.cpp
@@ -875,6 +877,7 @@ set(viewer_HEADER_FILES
     llpanelpermissions.h
     llpanelpick.h
     llpanelplace.h
+    llpanelprofile.h
     llpanelskins.h
     llpanelvolume.h
     llpanelweb.h
@@ -1048,6 +1051,7 @@ set(viewer_HEADER_FILES
     llwearablelist.h
     llwearabletype.h
     llweb.h
+    llwebprofile.h
     llwind.h
     llwindebug.h
     llwlanimator.h