diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llfloatertools.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llfloatertools.cpp')
| -rw-r--r-- | linden/indra/newview/llfloatertools.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp index e22de66..2bf4b31 100644 --- a/linden/indra/newview/llfloatertools.cpp +++ b/linden/indra/newview/llfloatertools.cpp | |||
| @@ -393,6 +393,7 @@ BOOL LLFloaterTools::postBuild() | |||
| 393 | mStatusText["rotate"] = getString("status_rotate"); | 393 | mStatusText["rotate"] = getString("status_rotate"); |
| 394 | mStatusText["scale"] = getString("status_scale"); | 394 | mStatusText["scale"] = getString("status_scale"); |
| 395 | mStatusText["move"] = getString("status_move"); | 395 | mStatusText["move"] = getString("status_move"); |
| 396 | mStatusText["selectface"] = getString("status_selectface"); | ||
| 396 | mStatusText["align"] = getString("status_align"); | 397 | mStatusText["align"] = getString("status_align"); |
| 397 | mStatusText["modifyland"] = getString("status_modifyland"); | 398 | mStatusText["modifyland"] = getString("status_modifyland"); |
| 398 | mStatusText["camera"] = getString("status_camera"); | 399 | mStatusText["camera"] = getString("status_camera"); |