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

Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp

indra/newview/CMakeLists.txt

@@ -10,9 +10,10 @@ include(ELFIO)
 if(FMODEX)
   include(FMODEX)
   set(FMOD OFF)
-else(FMODEX)
-  include(FMOD)
 endif(FMODEX)
+if(FMOD)
+  include(FMOD)
+endif(FMOD)
 include(OPENAL)
 include(FindOpenGL)
 include(Hunspell)
@@ -27,7 +28,7 @@ include(LLInventory)
 include(LLMath)
 include(LLMessage)
 include(LLPlugin)
-include(AIStateMachine)
+include(StateMachine)
 include(LLPrimitive)
 include(LLRender)
 include(LLUI)
@@ -50,6 +51,7 @@ endif (WINDOWS)
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/newview
+    ${STATEMACHINE_INCLUDE_DIRS}
     ${DBUSGLIB_INCLUDE_DIRS}
     ${HUNSPELL_INCLUDE_DIR}
     ${ELFIO_INCLUDE_DIR}
@@ -90,7 +92,6 @@ set(viewer_SOURCE_FILES
     hippogridmanager.cpp
     hippolimits.cpp
     hippopanelgrids.cpp
-    hipporestrequest.cpp
     importtracker.cpp
     jcfloaterareasearch.cpp
     lggdicdownload.cpp
@@ -132,7 +133,6 @@ set(viewer_SOURCE_FILES
     llconfirmationmanager.cpp
     llconsole.cpp
     llcontainerview.cpp
-    llcurlrequest.cpp
     llcurrencyuimanager.cpp
     llcylinder.cpp
     lldaycyclemanager.cpp
@@ -217,6 +217,7 @@ set(viewer_SOURCE_FILES
     llfloatermap.cpp
     llfloatermediabrowser.cpp
     llfloatermemleak.cpp
+    llfloatermessagelog.cpp
     llfloatermodeluploadbase.cpp
     llfloatermute.cpp
     llfloaternamedesc.cpp
@@ -224,6 +225,7 @@ set(viewer_SOURCE_FILES
     llfloaternotificationsconsole.cpp
     llfloaterobjectiminfo.cpp
     llfloateropenobject.cpp
+    llfloateroutbox.cpp
     llfloaterparcel.cpp
     llfloaterpermissionsmgr.cpp
     llfloaterperms.cpp
@@ -304,6 +306,7 @@ set(viewer_SOURCE_FILES
     llmanipscale.cpp
     llmaniptranslate.cpp
     llmapresponders.cpp
+    llmarketplacefunctions.cpp
     llmarketplacenotifications.cpp
     llmediactrl.cpp
     llmediaremotectrl.cpp
@@ -356,6 +359,7 @@ set(viewer_SOURCE_FILES
     llpanellandoptions.cpp
     llpanellogin.cpp
     llpanelmaininventory.cpp
+    llpanelmarketplaceoutboxinventory.cpp
     llpanelmediahud.cpp
     llpanelmorph.cpp
     llpanelmsgs.cpp
@@ -545,7 +549,7 @@ set(viewer_SOURCE_FILES
     llworldmapmessage.cpp
     llworldmipmap.cpp
     llworldmapview.cpp
-    llxmlrpctransaction.cpp
+    llxmlrpcresponder.cpp
     m7wlinterface.cpp
     NACLantispam.cpp
     noise.cpp
@@ -592,7 +596,6 @@ set(viewer_HEADER_FILES
     hippogridmanager.h
     hippolimits.h
     hippopanelgrids.h
-    hipporestrequest.h
     importtracker.h
     jcfloaterareasearch.h
     lggdicdownload.h
@@ -635,7 +638,6 @@ set(viewer_HEADER_FILES
     llconfirmationmanager.h
     llconsole.h
     llcontainerview.h
-    llcurlrequest.h
     llcurrencyuimanager.h
     llcylinder.h
     lldaycyclemanager.h
@@ -720,6 +722,7 @@ set(viewer_HEADER_FILES
     llfloatermap.h
     llfloatermediabrowser.h
     llfloatermemleak.h
+    llfloatermessagelog.h
     llfloatermodeluploadbase.h
     llfloatermute.h
     llfloaternamedesc.h
@@ -727,6 +730,7 @@ set(viewer_HEADER_FILES
     llfloaternotificationsconsole.h
     llfloaterobjectiminfo.h
     llfloateropenobject.h
+    llfloateroutbox.h
     llfloaterparcel.h
     llfloaterpermissionsmgr.h
     llfloaterperms.h
@@ -807,6 +811,7 @@ set(viewer_HEADER_FILES
     llmanipscale.h
     llmaniptranslate.h
     llmapresponders.h
+    llmarketplacefunctions.h
     llmarketplacenotifications.h
     llmediactrl.h
     llmediaremotectrl.h
@@ -859,6 +864,7 @@ set(viewer_HEADER_FILES
     llpanellandoptions.h
     llpanellogin.h
     llpanelmaininventory.h
+    llpanelmarketplaceoutboxinventory.h
     llpanelmediahud.h
     llpanelmorph.h
     llpanelmsgs.h
@@ -1054,7 +1060,7 @@ set(viewer_HEADER_FILES
     llworldmapmessage.h
     llworldmipmap.h
     llworldmapview.h
-    llxmlrpctransaction.h
+    llxmlrpcresponder.h
     m7wlinterface.h
     macmain.h
     NACLantispam.h
@@ -1273,8 +1279,6 @@ if (WINDOWS)
     if (INTEL_MEMOPS_LIBRARY)
       list(APPEND viewer_LIBRARIES ${INTEL_MEMOPS_LIBRARY})
     endif (INTEL_MEMOPS_LIBRARY)
-
-    use_prebuilt_binary(dbghelp)
 endif (WINDOWS)
 
 # Add the xui files. This is handy for searching for xui elements
@@ -1372,13 +1376,10 @@ if (FMOD OR FMODEX)
     set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMOD")
   endif (FMOD)
 
-  if (DARWIN)
-    if(FMOD)
+  if (DARWIN AND FMOD)
       set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
       add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
-      if (FMOD)
-        set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY})
-      endif (FMOD)
+      set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY})
       set_target_properties(
         fmodwrapper
         PROPERTIES
@@ -1388,11 +1389,7 @@ if (FMOD OR FMODEX)
         )
       set(FMODWRAPPER_LIBRARY fmodwrapper)
       target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES})
-    endif(FMOD)
-    if(FMODEX)
-      set(FMODWRAPPER_LIBRARY ${FMODEX_LIBRARY})
-    endif(FMODEX)
-  else (DARWIN)
+  else (DARWIN AND FMOD)
     # fmodwrapper unnecessary on linux or windows, for fmod and fmodex
     if (FMODEX)
        set(FMODWRAPPER_LIBRARY ${FMODEX_LIBRARY})
@@ -1400,7 +1397,7 @@ if (FMOD OR FMODEX)
     if (FMOD)
        set(FMODWRAPPER_LIBRARY ${FMOD_LIBRARY})
     endif (FMOD)
-  endif (DARWIN)
+  endif (DARWIN AND FMOD)
 endif (FMOD OR FMODEX)
 
 set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")
@@ -1436,9 +1433,9 @@ set(PACKAGE ${PACKAGE_DEFAULT} CACHE BOOL
 if (WINDOWS)
     if(MSVC10)
         set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map")
-    else()
+    else(MSVC10)
         set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
-    endif()
+    endif(MSVC10)
 
     if (FMOD)
         if(MANIFEST_LIBRARIES)
@@ -1551,7 +1548,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${LLINVENTORY_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
     ${LLPLUGIN_LIBRARIES}
-    ${AISTATEMACHINE_LIBRARIES}
+    ${STATEMACHINE_LIBRARIES}
     ${LLPRIMITIVE_LIBRARIES}
     ${LLRENDER_LIBRARIES}
     ${FREETYPE_LIBRARIES}