summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2011-11-17 17:33:49 -0500
committerprep <prep@lindenlab.com>2011-11-17 17:33:49 -0500
commit38b7f033b28027711a03e5a28d6ea384be909318 (patch)
tree76b76b4def34386dff655abf7d60dbabe3219d26
parent378c076d1df5d911e07959638fbd61a9094384d2 (diff)
navmeshdata is now parsed as binary
-rw-r--r--indra/llrender/llgl.h2
-rw-r--r--indra/newview/llnavmeshstation.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index 5b2fcf422c..d736133f3f 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -33,7 +33,7 @@
#include <boost/unordered_map.hpp>
#include <list>
-//#include "llerror.h"
+#include "llerror.h"
#include "v4color.h"
#include "llstring.h"
#include "stdtypes.h"
diff --git a/indra/newview/llnavmeshstation.cpp b/indra/newview/llnavmeshstation.cpp
index 6f491c34c9..2f7e62b8ae 100644
--- a/indra/newview/llnavmeshstation.cpp
+++ b/indra/newview/llnavmeshstation.cpp
@@ -105,14 +105,13 @@ public:
if ( content.has("error") )
{
llwarns << "Error on fetched data"<< llendl;
+ llinfos<<"LLsd buffer on error"<<ll_pretty_print_sd(content)<<llendl;
}
else
{
LLNavMeshDownloadObserver* pObserver = mObserverHandle.get();
if ( pObserver )
{
- llinfos<<"Do something immensely important w/content"<<llendl;
- llinfos<<"LLsd buffer"<<ll_pretty_print_sd(content)<<llendl;
if ( content.has("navmesh_data") )
{
@@ -125,7 +124,7 @@ public:
}
}
}
- }
+}
private:
//Observer handle