Correct a typo in setting name for preferences panel
Don't changeCameraToDefault when notecards open.
Max prim scale on opensim is now 8192 (server restrictions may apply, limit one per customer)
Avoid compile error when using glh and boost at the same time.

Defining a macro in a header that doesn't have any namespace prefix
like GLH_ ugh. Very bad.

Changed the macro into an inline function inside namespace glh.
Since views cleanup their children, drop target's destructor doesn't need to.
Feature Request: Add an option to show the grid name in title

LiruGridInTitle is the debug
Feature Request: Add a debug setting for how many lines of history to show when LogShowHistory

LogShowHistoryLines is the setting
This change cleans up some very C code in lllogchat.cpp
Feature Request: Add a debug setting to prevent double clicking on the world map resulting in a teleport

Adds DoubleClickTeleportMap to debug settings.
Group chat seems to want script reset from object inventory, so here you go.
Fix Save Preview As... for textures, now save as any type we can encode to!

Removes the previous method and condenses the menu entries back into one.
 - Translations have been updated except for German, German will need to update the translation for "Save Preview As..." since the name hasn't changed.
Adds FFSAVE_IMAGE to the filepicker enums
Crossplatformity:
 - The Windows version works nicely
 - The Linux version may not work or even compile but it should..
 - The Mac version hasn't been added, instead it will default to accept any(all filter), should the provided file extension be invalid a notification will display.
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
Collada export, now with more awesome

* Added support for exporting textures
* Added support for applying texture parameters
* Added support for merging faces with same textures
* Added support for skipping transparent faces
Made texture export on by default when exporting Collada.