Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.

1 files changed, 92 insertions, 0 deletions

diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 82b43432eb..7a9be77f96 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -558,6 +558,98 @@ STATUS_NOT_SUPPORTED                   Feature not supported
 STATUS_INTERNAL_ERROR                  An internal error occurred
 STATUS_WHITELIST_FAILED                URL failed to pass whitelist
 
+PROFILE_NONE               Disables profiling
+PROFILE_SCRIPT_MEMORY      Enables memory profiling
+
+RC_DATA_FLAGS          TODO: add documentation
+RC_DETECT_PHANTOM      TODO: add documentation
+RC_GET_LINK_NUM        TODO: add documentation
+RC_GET_NORMAL          TODO: add documentation
+RC_GET_ROOT_KEY        TODO: add documentation
+RC_MAX_HITS            TODO: add documentation
+RC_REJECT_TYPES			Optional parameter set in llCastRay() to reject hit against certain object types.
+RC_REJECT_AGENTS		Bit mask for RC_REJECT_TYPES, rejects hits against avatars.
+RC_REJECT_PHYSICAL		Bit mask for RC_REJECT_TYPES, rejects hits against moving objects.
+RC_REJECT_NONPHYSICAL	Bit mask for RC_REJECT_TYPES, rejects hits against non-moving objects.
+RC_REJECT_LAND			Bit mask for RC_REJECT_TYPES, rejects hits against the terrian.
+
+RCERR_CAST_TIME_EXCEEDED    TODO: add documentation
+RCERR_SIM_PERF_LOW          TODO: add documentation
+RCERR_UNKNOWN               TODO: add documentation
+
+ESTATE_ACCESS_ALLOWED_AGENT_ADD    TODO: add documentation
+ESTATE_ACCESS_ALLOWED_AGENT_REMOVE TODO: add documentation
+ESTATE_ACCESS_ALLOWED_GROUP_ADD    TODO: add documentation
+ESTATE_ACCESS_ALLOWED_GROUP_REMOVE TODO: add documentation
+ESTATE_ACCESS_BANNED_AGENT_ADD     TODO: add documentation
+ESTATE_ACCESS_BANNED_AGENT_REMOVE  TODO: add documentation
+
+DENSITY 			TODO: add documentation
+FRICTION 			TODO: add documentation
+RESTITUTION 		TODO: add documentation
+GRAVITY_MULTIPLIER 	TODO: add documentation
+
+KFM_COMMAND			TODO: add documentation
+KFM_CMD_PLAY		TODO: add documentation
+KFM_CMD_STOP		TODO: add documentation
+KFM_CMD_PAUSE		TODO: add documentation
+KFM_CMD_SET_MODE	TODO: add documentation
+KFM_MODE			TODO: add documentation
+KFM_FORWARD			TODO: add documentation
+KFM_LOOP			TODO: add documentation
+KFM_PING_PONG		TODO: add documentation
+KFM_REVERSE			TODO: add documentation
+KFM_DATA			TODO: add documentation
+KFM_ROTATION		TODO: add documentation
+KFM_TRANSLATION		TODO: add documentation
+
+CHARACTER_CMD_STOP	TODO: add documentation
+CHARACTER_CMD_JUMP	TODO: add documentation
+
+CHARACTER_DESIRED_SPEED		TODO: add documentation
+CHARACTER_RADIUS			TODO: add documentation
+CHARACTER_LENGTH			TODO: add documentation
+CHARACTER_ORIENTATION		TODO: add documentation
+CHARACTER_AVOIDANCE_MODE	TODO: add documentation
+PURSUIT_OFFSET				TODO: add documentation
+REQUIRE_LINE_OF_SIGHT		TODO: add documentation
+PURSUIT_FUZZ_FACTOR			TODO: add documentation
+PURSUIT_INTERCEPT			TODO: add documentation
+FORCE_DIRECT_PATH			TODO: add documentation
+VERTICAL					TODO: add documentation
+HORIZONTAL					TODO: add documentation
+AVOID_CHARACTERS			TODO: add documentation
+AVOID_DYNAMIC_OBSTACLES		TODO: add documentation
+
+PU_EVADE_HIDDEN                  Triggered when an llEvade character thinks it has hidden from its pursuer.
+PU_EVADE_SPOTTED                 Triggered when an llEvade character switches from hiding to running
+PU_FAILURE_INVALID_GOAL          Goal is not on the navigation-mesh and cannot be reached.
+PU_FAILURE_INVALID_START         Character cannot navigate from the current location - e.g., the character is off the navmesh or too high above it.
+PU_FAILURE_NO_VALID_DESTINATION  There's no good place for the character to go - e.g., it is patrolling and all the patrol points are now unreachable.
+PU_FAILURE_OTHER			     Unknown failure
+PU_FAILURE_TARGET_GONE           Target (for llPursue or llEvade) can no longer be tracked - e.g., it left the region or is an avatar that is now more than about 30m outside the region.
+PU_FAILURE_UNREACHABLE           Goal is no longer reachable for some reason - e.g., an obstacle blocks the path.
+PU_GOAL_REACHED                  Character has reached the goal and will stop or choose a new goal (if wandering).
+PU_SLOWDOWN_DISTANCE_REACHED     Character is near current goal.
+
+CHARACTER_TYPE			TODO: add documentation
+CHARACTER_TYPE_A		TODO: add documentation
+CHARACTER_TYPE_B		TODO: add documentation
+CHARACTER_TYPE_C		TODO: add documentation
+CHARACTER_TYPE_D		TODO: add documentation
+CHARACTER_TYPE_NONE		TODO: add documentation
+
+TRAVERSAL_TYPE			TODO: add documentation
+TRAVERSAL_TYPE_SLOW		TODO: add documentation
+TRAVERSAL_TYPE_FAST		TODO: add documentation
+TRAVERSAL_TYPE_NONE		TODO: add documentation
+
+CHARACTER_MAX_ACCEL				TODO: add documentation
+CHARACTER_MAX_DECEL				TODO: add documentation
+CHARACTER_MAX_ANGULAR_SPEED		TODO: add documentation
+CHARACTER_MAX_ANGULAR_ACCEL		TODO: add documentation
+CHARACTER_TURN_SPEED_MULTIPLIER	TODO: add documentation
+
 # string constants
 [word .1, .3, .5]
 NULL_KEY			Indicates an empty key