diff options
| author | Dave Hiller <daveh@lindenlab.com> | 2008-07-31 12:15:15 +0000 |
|---|---|---|
| committer | Dave Hiller <daveh@lindenlab.com> | 2008-07-31 12:15:15 +0000 |
| commit | 9a7d68cfce5f71cf9d89536431d72941dc369749 (patch) | |
| tree | f7e0ce093abef0fcc7737cac63bc2a8dbf11b729 /indra/llcommon | |
| parent | f0f2a416911ba8de9ac1e08cd90720c0d789bb2e (diff) | |
svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llassettype.cpp | 4 | ||||
| -rw-r--r-- | indra/llcommon/llstatenums.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp index 368c85acb0..08dcef2538 100644 --- a/indra/llcommon/llassettype.cpp +++ b/indra/llcommon/llassettype.cpp @@ -128,7 +128,7 @@ const char* LLAssetType::mAssetTypeNames[LLAssetType::AT_COUNT] = "jpeg", "animatn", "gesture", - "simstate", + "simstate" }; // This table is meant for decoding to human readable form. Put any @@ -158,7 +158,7 @@ const char* LLAssetType::mAssetTypeHumanNames[LLAssetType::AT_COUNT] = "jpeg image", "animation", "gesture", - "simstate", + "simstate" }; ///---------------------------------------------------------------------------- diff --git a/indra/llcommon/llstatenums.h b/indra/llcommon/llstatenums.h index a82996b852..45c4fa986b 100644 --- a/indra/llcommon/llstatenums.h +++ b/indra/llcommon/llstatenums.h @@ -63,7 +63,8 @@ enum LL_SIM_STAT_SIMPHYSICSSTEPMS, LL_SIM_STAT_SIMPHYSICSSHAPEMS, LL_SIM_STAT_SIMPHYSICSOTHERMS, - LL_SIM_STAT_SIMPHYSICSMEMORY + LL_SIM_STAT_SIMPHYSICSMEMORY, + LL_SIM_STAT_SCRIPT_EPS, }; #endif |