I'm special!
Merge branch 'master' into permy_wiggle
lol
shift clicking
left click -> face texture
right click -> sculpt texture
Really didn't think that through -- AO
adding inventory backup
Clearly time to sleep, I keep skipping up
Cherry Pick Revision
Cherries were picked and washed.
I made them into a pie.
Mmm, pie.

Basically I imported a ton of goodies from PP's Twig viewer.
Not everything is here, but it's a good start for now.

TO-DO: Special functionality switch control.

Last cherry pick message:

Put the asset uuid into the description for ease of use
Local Inventory

Conflicts:
	indra/newview/lllocalinventory.cpp
Merge branch 'master' into permy_wiggle
Merge branch 'master' into permy_wiggle
Merge branch 'master' into permy_wiggle

Conflicts:
	indra/newview/llpanelface.cpp
	indra/newview/lltoolpie.cpp
	indra/newview/llviewerinventory.cpp
	indra/newview/llviewermenu.cpp
Need this, too
Merge branch 'master' into permy_wiggle
Add support for Cinema 4D
Some remapping is necessary to account for Cinema 4D's bizarre
SID values in exported DAE files.
Merge branch 'master' into permy_wiggle
Merge branch 'C4D_DAE_fix_lite' into permy_wiggle

Conflicts:
	indra/newview/llfloatermodelpreview.cpp
massive refactor
Merge branch 'master' into permy_wiggle
splash
Merge branch 'master' into permy_wiggle