From f25ca2ac80f37fa7ab98949843c510bde55a6258 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 12 Nov 2012 00:12:39 -0600
Subject: [PATCH] Fixed small #if/#ifdef typo. Also fixed formatting error in
 strings.xml

---
 indra/llrender/llvertexbuffer.cpp                 |  2 +-
 indra/newview/skins/default/xui/en-us/strings.xml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 3f6cd6227..d10a9c6bb 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -2086,7 +2086,7 @@ void LLVertexBuffer::flush()
 // bind for transform feedback (quick 'n dirty)
 void LLVertexBuffer::bindForFeedback(U32 channel, U32 type, U32 index, U32 count)
 {
-#if GL_TRANSFORM_FEEDBACK_BUFFER
+#ifdef GL_TRANSFORM_FEEDBACK_BUFFER
 	U32 offset = mOffsets[type] + sTypeSize[type]*index;
 	U32 size= (sTypeSize[type]*count);
 	glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, channel, mGLBuffer, offset, size);
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 6680ab9c1..3ef6bc38d 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -1920,14 +1920,14 @@ For AI Character: Navigate to destination.
 	<string name="LSLTipText_llCreateCharacter">
 llCreateCharacter(list options)
 Convert linkset to AI Character which can navigate the world.
-  <!-- Pathfinding -->
-  <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
-  <string name="Pathfinding_Object_Attr_None">None</string>
-  <string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
-  <string name="Pathfinding_Object_Attr_Character">Character</string>
-  <string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
-
 	</string>
+	<!-- Pathfinding -->
+	<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
+	<string name="Pathfinding_Object_Attr_None">None</string>
+	<string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
+	<string name="Pathfinding_Object_Attr_Character">Character</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
+
 	<string name="LSLTipText_llPursue">
 llPursue(key target, list options)
 For AI Character: Chase after a target.