summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatergotoline.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-05-15 12:18:31 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-05-15 12:18:31 -0400
commit7ccf02515ad3f9e3bf795d651fe4b3c0d773f353 (patch)
treec4adc897c07f652e617e91fbf41c12b823acc808 /indra/newview/llfloatergotoline.cpp
parent1abf5f18d6afc7ae9e1b1562b92e5c1ce33b722f (diff)
parente7eced3c87310b15ac20cc3cd470d67686104a14 (diff)
Merge commit 'e7eced3' into lua-timers for whitespace fixes.
Diffstat (limited to 'indra/newview/llfloatergotoline.cpp')
-rw-r--r--indra/newview/llfloatergotoline.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/indra/newview/llfloatergotoline.cpp b/indra/newview/llfloatergotoline.cpp
index 3b34f03532..005a7b3d4a 100644
--- a/indra/newview/llfloatergotoline.cpp
+++ b/indra/newview/llfloatergotoline.cpp
@@ -43,7 +43,7 @@ LLFloaterGotoLine::LLFloaterGotoLine(LLScriptEdCore* editor_core)
buildFromFile("floater_goto_line.xml");
sInstance = this;
-
+
// find floater in which script panel is embedded
LLView* viewp = (LLView*)editor_core;
while(viewp)
@@ -60,9 +60,9 @@ LLFloaterGotoLine::LLFloaterGotoLine(LLScriptEdCore* editor_core)
BOOL LLFloaterGotoLine::postBuild()
{
- mGotoBox = getChild<LLLineEditor>("goto_line");
- mGotoBox->setCommitCallback(boost::bind(&LLFloaterGotoLine::onGotoBoxCommit, this));
- mGotoBox->setCommitOnFocusLost(FALSE);
+ mGotoBox = getChild<LLLineEditor>("goto_line");
+ mGotoBox->setCommitCallback(boost::bind(&LLFloaterGotoLine::onGotoBoxCommit, this));
+ mGotoBox->setCommitOnFocusLost(FALSE);
getChild<LLLineEditor>("goto_line")->setPrevalidate(LLTextValidate::validateNonNegativeS32);
childSetAction("goto_btn", onBtnGoto,this);
setDefaultBtn("goto_btn");
@@ -70,7 +70,7 @@ BOOL LLFloaterGotoLine::postBuild()
return TRUE;
}
-//static
+//static
void LLFloaterGotoLine::show(LLScriptEdCore* editor_core)
{
if (sInstance && sInstance->mEditorCore && sInstance->mEditorCore != editor_core)
@@ -93,7 +93,7 @@ LLFloaterGotoLine::~LLFloaterGotoLine()
sInstance = NULL;
}
-// static
+// static
void LLFloaterGotoLine::onBtnGoto(void *userdata)
{
LLFloaterGotoLine* self = (LLFloaterGotoLine*)userdata;
@@ -109,9 +109,9 @@ void LLFloaterGotoLine::handleBtnGoto()
{
if (mEditorCore && mEditorCore->mEditor)
{
- mEditorCore->mEditor->deselect();
- mEditorCore->mEditor->setCursor(row, column);
- mEditorCore->mEditor->setFocus(TRUE);
+ mEditorCore->mEditor->deselect();
+ mEditorCore->mEditor->setCursor(row, column);
+ mEditorCore->mEditor->setFocus(TRUE);
}
}
}
@@ -144,17 +144,17 @@ void LLFloaterGotoLine::onGotoBoxCommit()
{
if (mEditorCore && mEditorCore->mEditor)
{
- mEditorCore->mEditor->setCursor(row, column);
-
- S32 rownew = 0;
- S32 columnnew = 0;
- mEditorCore->mEditor->getCurrentLineAndColumn( &rownew, &columnnew, FALSE ); // don't include wordwrap
- if (rownew == row && columnnew == column)
- {
- mEditorCore->mEditor->deselect();
- mEditorCore->mEditor->setFocus(TRUE);
- sInstance->closeFloater();
- } //else do nothing (if the cursor-position didn't change)
+ mEditorCore->mEditor->setCursor(row, column);
+
+ S32 rownew = 0;
+ S32 columnnew = 0;
+ mEditorCore->mEditor->getCurrentLineAndColumn( &rownew, &columnnew, FALSE ); // don't include wordwrap
+ if (rownew == row && columnnew == column)
+ {
+ mEditorCore->mEditor->deselect();
+ mEditorCore->mEditor->setFocus(TRUE);
+ sInstance->closeFloater();
+ } //else do nothing (if the cursor-position didn't change)
}
}
}