Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
439a7df6
Commit
439a7df6
authored
13 years ago
by
Jonathan Yap
Browse files
Options
Downloads
Patches
Plain Diff
STORM-637 Scripts Progress windows Missing
parent
4ef92777
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/contributions.txt
+1
-0
1 addition, 0 deletions
doc/contributions.txt
indra/newview/llcompilequeue.cpp
+8
-7
8 additions, 7 deletions
indra/newview/llcompilequeue.cpp
indra/newview/llviewermenu.cpp
+7
-0
7 additions, 0 deletions
indra/newview/llviewermenu.cpp
with
16 additions
and
7 deletions
doc/contributions.txt
+
1
−
0
View file @
439a7df6
...
...
@@ -610,6 +610,7 @@ Jonathan Yap
STORM-1788
STORM-1799
STORM-1796
STORM-637
Kadah Coba
STORM-1060
Jondan Lundquist
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llcompilequeue.cpp
+
8
−
7
View file @
439a7df6
...
...
@@ -100,6 +100,7 @@ BOOL LLFloaterScriptQueue::postBuild()
{
childSetAction
(
"close"
,
onCloseBtn
,
this
);
getChildView
(
"close"
)
->
setEnabled
(
FALSE
);
setVisible
(
true
);
return
TRUE
;
}
...
...
@@ -178,7 +179,7 @@ BOOL LLFloaterScriptQueue::start()
args
[
"[COUNT]"
]
=
llformat
(
"%d"
,
mObjectIDs
.
count
());
buffer
=
getString
(
"Starting"
,
args
);
getChild
<
LLScrollListCtrl
>
(
"queue output"
)
->
setCommentText
(
buffer
);
getChild
<
LLScrollListCtrl
>
(
"queue output"
)
->
addSimpleElement
(
buffer
,
ADD_BOTTOM
);
return
nextObject
();
}
...
...
@@ -211,7 +212,7 @@ BOOL LLFloaterScriptQueue::nextObject()
if
(
isDone
()
&&
!
mDone
)
{
mDone
=
true
;
getChild
<
LLScrollListCtrl
>
(
"queue output"
)
->
setCommentTex
t
(
getString
(
"Done"
));
getChild
<
LLScrollListCtrl
>
(
"queue output"
)
->
addSimpleElemen
t
(
getString
(
"Done"
)
,
ADD_BOTTOM
);
getChildView
(
"close"
)
->
setEnabled
(
TRUE
);
}
return
successful_start
;
...
...
@@ -277,7 +278,7 @@ class LLCompileFloaterUploadQueueSupplier : public LLAssetUploadQueueSupplier
return
;
}
queue
->
getChild
<
LLScrollListCtrl
>
(
"queue output"
)
->
setCommentText
(
message
);
queue
->
getChild
<
LLScrollListCtrl
>
(
"queue output"
)
->
addSimpleElement
(
message
,
ADD_BOTTOM
);
}
private
:
...
...
@@ -464,7 +465,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
}
if
(
queue
&&
(
buffer
.
size
()
>
0
))
{
queue
->
getChild
<
LLScrollListCtrl
>
(
"queue output"
)
->
setCommentText
(
buffer
);
queue
->
getChild
<
LLScrollListCtrl
>
(
"queue output"
)
->
addSimpleElement
(
buffer
,
ADD_BOTTOM
);
}
delete
data
;
}
...
...
@@ -637,7 +638,7 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
LLInventoryItem
*
item
=
(
LLInventoryItem
*
)((
LLInventoryObject
*
)(
*
it
));
std
::
string
buffer
;
buffer
=
getString
(
"Resetting"
)
+
(
": "
)
+
item
->
getName
();
getChild
<
LLScrollListCtrl
>
(
"queue output"
)
->
setCommentText
(
buffer
);
getChild
<
LLScrollListCtrl
>
(
"queue output"
)
->
addSimpleElement
(
buffer
,
ADD_BOTTOM
);
LLMessageSystem
*
msg
=
gMessageSystem
;
msg
->
newMessageFast
(
_PREHASH_ScriptReset
);
msg
->
nextBlockFast
(
_PREHASH_AgentData
);
...
...
@@ -690,7 +691,7 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
LLScrollListCtrl
*
list
=
getChild
<
LLScrollListCtrl
>
(
"queue output"
);
std
::
string
buffer
;
buffer
=
getString
(
"Running"
)
+
(
": "
)
+
item
->
getName
();
list
->
setCommentText
(
buffer
);
list
->
addSimpleElement
(
buffer
,
ADD_BOTTOM
);
LLMessageSystem
*
msg
=
gMessageSystem
;
msg
->
newMessageFast
(
_PREHASH_SetScriptRunning
);
...
...
@@ -745,7 +746,7 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
LLScrollListCtrl
*
list
=
getChild
<
LLScrollListCtrl
>
(
"queue output"
);
std
::
string
buffer
;
buffer
=
getString
(
"NotRunning"
)
+
(
": "
)
+
item
->
getName
();
list
->
setCommentText
(
buffer
);
list
->
addSimpleElement
(
buffer
,
ADD_BOTTOM
);
LLMessageSystem
*
msg
=
gMessageSystem
;
msg
->
newMessageFast
(
_PREHASH_SetScriptRunning
);
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llviewermenu.cpp
+
7
−
0
View file @
439a7df6
...
...
@@ -6509,31 +6509,37 @@ class LLToolsSelectedScriptAction : public view_listener_t
std
::
string
action
=
userdata
.
asString
();
bool
mono
=
false
;
std
::
string
msg
,
name
;
std
::
string
title
;
if
(
action
==
"compile mono"
)
{
name
=
"compile_queue"
;
mono
=
true
;
msg
=
"Recompile"
;
title
=
LLTrans
::
getString
(
"CompileQueueTitle"
);
}
if
(
action
==
"compile lsl"
)
{
name
=
"compile_queue"
;
msg
=
"Recompile"
;
title
=
LLTrans
::
getString
(
"CompileQueueTitle"
);
}
else
if
(
action
==
"reset"
)
{
name
=
"reset_queue"
;
msg
=
"Reset"
;
title
=
LLTrans
::
getString
(
"ResetQueueTitle"
);
}
else
if
(
action
==
"start"
)
{
name
=
"start_queue"
;
msg
=
"SetRunning"
;
title
=
LLTrans
::
getString
(
"RunQueueTitle"
);
}
else
if
(
action
==
"stop"
)
{
name
=
"stop_queue"
;
msg
=
"SetRunningNot"
;
title
=
LLTrans
::
getString
(
"NotRunQueueTitle"
);
}
LLUUID
id
;
id
.
generate
();
...
...
@@ -6542,6 +6548,7 @@ class LLToolsSelectedScriptAction : public view_listener_t
{
queue
->
setMono
(
mono
);
queue_actions
(
queue
,
msg
);
queue
->
setTitle
(
title
);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment