diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
| commit | a8ef2525711f1f9312c1c9ebb8f137f4d25e659a (patch) | |
| tree | b1486d5ab0b0eddc26a7dc0f369b12f612179869 /indra/newview/llpanelcontents.cpp | |
| parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
merge changes for 3.7.27-release
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
| -rwxr-xr-x | indra/newview/llpanelcontents.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp index 407cbfc47b..451f41cd3b 100755 --- a/indra/newview/llpanelcontents.cpp +++ b/indra/newview/llpanelcontents.cpp @@ -197,9 +197,6 @@ void LLPanelContents::onClickNewScript(void *userdata) // *TODO: The script creation should round-trip back to the // viewer so the viewer can auto-open the script and start // editing ASAP. -#if 0 - LLFloaterReg::showInstance("preview_scriptedit", LLSD(inv_item->getUUID()), TAKE_FOCUS_YES); -#endif } } |