ColladaLoaderTest now loads collada files, there are essentially no tests except for seeing that the meshdata obtained from the collada file is not null.
Merge branch 'master' of https://github.com/sirikata/sirikata
More testing was added to ColladaLoaderTest, specifically testing minimal collada file aspects.
Only build collada loader test if colladamodels plugin is built.
Make collada tests search for data cross platform and bail if it can't find it.
Fix typo: SIRIKATA_WINDOWS -> SIRIKATA_PLATFORM_WINDOWS
Added testing for loading meshdata from bad data
Remove some include directories that shouldn't be used.

These used to be there for historical reasons, but now there shouldn't
be any need to include from cppoh's directory or build/cmake/ as
nothing shared should be in either of those directories.
Merge branch 'master' of https://github.com/sirikata/sirikata
Added shapes/examples to be tested in ColladaLoaderTest
Added check in ColladaSystem to see if DenseData can load before loading

Clean up test files with more comments and helper functions
Added more tests for more shapes and properties
Add skeleton mesh-ply plugin.

Add skeleton mesh-ply plugin with barebones ModelsSystem
implementation for .ply files. Add it to default list of plugins for
cppoh, space, meshview, and meshtool.
Properly cleanup DownloadPlanner in OgreRenderer.

Make OgreRenderer properly stop and delete the DownloadPlanner. In the
DownloadPlanner classes, make sure Liveness::letDie is called and that
base class implementations of Service start and stop are called, all
the way down to PollingService, so that Timers are properly
cleared. This makes it so the DownloadPlanner shouldn't block clean
shutdown. For example, this makes meshview shutdown cleanly (other
binaries are still blocked by other things).
only echo the websocket protocol back when the protocol is provided by the client: this prevents the bug that was exposed by the Chrome-12 release, rejecting the connection to the websocket server because the (nonexistant) client protocol was not mirrored by the server
Fix timer cleanup in SQLiteStorage.

When stop was invoked, SQLiteStorage was just cancelling its timer,
then joining its IO thread. This could frequently end up blocking
because the other thread had no check for whether stop had been
called, so it could start reusing the timer, which would continue to
block the IO thread and in turn block the thread calling stop.

This changes the behavior to actually reset the shared_ptr so the
is actually removed and can't be reused. Where the timer is used we
need to copy the shared_ptr to ensure it stays valid, then call
wait().
Stop OrphanLocUpdateManagers at correct time in SimpleObjectQueryProcesser.

Invoke stop() on still-active OrphanLocUpdateManagers in
SimpleObjectQueryProcessor::stop(). Previously it was only invoked
when the objects were removed from the current set of objects, which
only happened in the destructor during shutdown.
Add some debug-only code to warn of misuse of Poller (and all its subclasses).
Remove now unnecessary handlerShouldHandleObject method in manual query processor.

libprox has been updated to not require this if it will always return
true, so we can safely remove it now.
Remove UUIDProxSimulationTraits.

This was leftover because the space server was originally written
around UUIDs rather than ObjectReferences. However, it'll cause
problems in reusing some of the libpintoloc code, which needs query
processors to use the same types. This removes
UUIDProxSimulationTraits, adjusting the libprox space plugins to work
with ObjectProxSimulationTraits and performs the necessary
translations between UUID and ObjectReference since the Proximity
interface and some others from the space server still use UUIDs.