Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
A bit of cleanup in preperation for VS2012
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
Initial work.
Merge branch 'master' of https://bitbucket.org/LightDrake/singularityviewer-test
Merge branch 'master' into meshupload
Fixed glod
Bug fix from v3
Update LLFloaterModelPreview and make it compile~

Collada include_directories and llfloatermodelpreview.*s added to CMakeLists.txt
Update to v-d, compile with AIFilePicker, comment spelling fixes.
Upload Mesh... entry added to File menu.
Updated AIFilePicker to have FFLOAD_COLLADA with an mFilter of "dae"
And, finally, add floater_model_preview.xml~
Added colors for mesh upload MeshImportTableNormalColor and MeshImportTableHighlightColor to default/colors_base.xml
Fixed linking
Merge branch 'meshupload' of https://bitbucket.org/LightDrake/singularityviewer-test into meshupload
Merge branch 'master' into meshupload
Added darwin and windows libraries and added copying of collada and glod
Merge branch 'master' into meshupload
Merge branch 'master' into meshupload
Fixed a build issue in clang
Add support for ".dae" (and others) to filepicker load filter.

* Brought llfilepicker.{cpp,h} up to speed with V3 by adding
  FFLOAD_MODEL, FFLOAD_COLLADA, FFLOAD_SCRIPT, FFLOAD_DICTIONARY
  However, note that we used FFLOAD_LSL, so I renamed their
  FFLOAD_SCRIPT to FFLOAD_LSL and kept our way of filtering.
* Fixed the filter token that is sent to the plugin for
  collada (from "dae" to "collada").
Renamed FFLOAD/SAVE_LSL to FFLOAD/SAVE_SCRIPT
Fix memory leak. This auto deletes the file picker, the old code did't.