diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-09-13 18:17:52 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-09-13 18:17:52 +0000 |
| commit | b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (patch) | |
| tree | 8b94c90d06bcd0ed5d258ab1e8c5d67024683cab /indra/newview/app_settings/keywords.ini | |
| parent | a5f3ac2a8dc9aee2c04f24c3b3304c1b24808acb (diff) | |
svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
Diffstat (limited to 'indra/newview/app_settings/keywords.ini')
| -rw-r--r-- | indra/newview/app_settings/keywords.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 4496ee746f..5a68c5b163 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -149,7 +149,7 @@ PSYS_SRC_PATTERN_ANGLE PSYS_SRC_PATTERN_ANGLE_CONE PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY -OBJECT_UNKOWN_DETAIL Returned by llGetObjectDetails when passed an invalid object parameter type. +OBJECT_UNKNOWN_DETAIL Returned by llGetObjectDetails when passed an invalid object parameter type. OBJECT_NAME Used with llGetObjectDetails to get an object's name. OBJECT_DESC Used with llGetObjectDetails to get an object's description. OBJECT_POS Used with llGetObjectDetails to get an object's position. |