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
172e85d6
Commit
172e85d6
authored
4 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix a few bugs with call dialog and toyboy with the top toolbar
parent
78b50c6a
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/newview/llfloatertoybox.cpp
+1
-0
1 addition, 0 deletions
indra/newview/llfloatertoybox.cpp
indra/newview/llimview.cpp
+4
-0
4 additions, 0 deletions
indra/newview/llimview.cpp
indra/newview/skins/default/xui/en/strings.xml
+1
-0
1 addition, 0 deletions
indra/newview/skins/default/xui/en/strings.xml
with
6 additions
and
0 deletions
indra/newview/llfloatertoybox.cpp
+
1
−
0
View file @
172e85d6
...
...
@@ -178,6 +178,7 @@ void LLFloaterToybox::onToolBarButtonEnter(LLView* button)
case
LLToolBarEnums
::
TOOLBAR_BOTTOM
:
suffix
=
LLTrans
::
getString
(
"Toolbar_Bottom_Tooltip"
);
break
;
case
LLToolBarEnums
::
TOOLBAR_LEFT
:
suffix
=
LLTrans
::
getString
(
"Toolbar_Left_Tooltip"
);
break
;
case
LLToolBarEnums
::
TOOLBAR_RIGHT
:
suffix
=
LLTrans
::
getString
(
"Toolbar_Right_Tooltip"
);
break
;
case
LLToolBarEnums
::
TOOLBAR_TOP
:
suffix
=
LLTrans
::
getString
(
"Toolbar_Top_Tooltip"
);
break
;
default:
break
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llimview.cpp
+
4
−
0
View file @
172e85d6
...
...
@@ -1989,6 +1989,10 @@ LLDockControl::DocAt LLCallDialog::getDockControlPos(const std::string& toolbarB
case
LLToolBarEnums
::
TOOLBAR_RIGHT
:
doc_at
=
LLDockControl
::
LEFT
;
break
;
case
LLToolBarEnums
::
TOOLBAR_TOP
:
doc_at
=
LLDockControl
::
BOTTOM
;
break
;
}
return
doc_at
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/strings.xml
+
1
−
0
View file @
172e85d6
...
...
@@ -4196,6 +4196,7 @@ Try enclosing path to the editor with double quotes.
<string
name=
"Command_Voice_Tooltip"
>
Volume controls for calls and people near you in world
</string>
<string
name=
"Command_Webbrowser_Tooltip"
>
Open a web browser inside [APP_NAME]
</string>
<string
name=
"Toolbar_Top_Tooltip"
>
currently in your top toolbar
</string>
<string
name=
"Toolbar_Bottom_Tooltip"
>
currently in your bottom toolbar
</string>
<string
name=
"Toolbar_Left_Tooltip"
>
currently in your left toolbar
</string>
<string
name=
"Toolbar_Right_Tooltip"
>
currently in your right toolbar
</string>
...
...
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