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
ce15e096
Commit
ce15e096
authored
10 months ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Use std::function to see if it fixes warning
parent
b01f2222
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/llinventorygallerymenu.cpp
+2
-2
2 additions, 2 deletions
indra/newview/llinventorygallerymenu.cpp
indra/newview/lllandmarkactions.h
+2
-2
2 additions, 2 deletions
indra/newview/lllandmarkactions.h
indra/newview/llworldmapmessage.h
+1
-1
1 addition, 1 deletion
indra/newview/llworldmapmessage.h
with
5 additions
and
5 deletions
indra/newview/llinventorygallerymenu.cpp
+
2
−
2
View file @
ce15e096
...
...
@@ -239,11 +239,11 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata)
}
else
if
(
"copy_slurl"
==
action
)
{
boo
st
::
function
<
void
(
LLLandmark
*
)
>
copy_slurl_cb
=
[](
LLLandmark
*
landmark
)
st
d
::
function
<
void
(
LLLandmark
*
)
>
copy_slurl_cb
=
[](
LLLandmark
*
landmark
)
{
LLVector3d
global_pos
;
landmark
->
getGlobalPos
(
global_pos
);
boo
st
::
function
<
void
(
std
::
string
&
slurl
)
>
copy_slurl_to_clipboard_cb
=
[](
std
::
string
&
slurl
)
st
d
::
function
<
void
(
std
::
string
&
slurl
)
>
copy_slurl_to_clipboard_cb
=
[](
std
::
string
&
slurl
)
{
gViewerWindow
->
getWindow
()
->
copyTextToClipboard
(
utf8str_to_wstring
(
slurl
));
LLSD
args
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/lllandmarkactions.h
+
2
−
2
View file @
ce15e096
...
...
@@ -39,8 +39,8 @@ class LLLandmark;
class
LLLandmarkActions
{
public:
typedef
boo
st
::
function
<
void
(
std
::
string
&
slurl
)
>
slurl_callback_t
;
typedef
boo
st
::
function
<
void
(
std
::
string
&
slurl
,
S32
x
,
S32
y
,
S32
z
)
>
region_name_and_coords_callback_t
;
typedef
st
d
::
function
<
void
(
std
::
string
&
slurl
)
>
slurl_callback_t
;
typedef
st
d
::
function
<
void
(
std
::
string
&
slurl
,
S32
x
,
S32
y
,
S32
z
)
>
region_name_and_coords_callback_t
;
/**
* @brief Fetches landmark LLViewerInventoryItems for the given landmark name.
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llworldmapmessage.h
+
1
−
1
View file @
ce15e096
...
...
@@ -38,7 +38,7 @@ class LLWorldMapMessage final : public LLSingleton<LLWorldMapMessage>
~
LLWorldMapMessage
();
public:
typedef
boo
st
::
function
<
void
(
U64
region_handle
,
const
std
::
string
&
url
,
const
LLUUID
&
snapshot_id
,
bool
teleport
)
>
typedef
st
d
::
function
<
void
(
U64
region_handle
,
const
std
::
string
&
url
,
const
LLUUID
&
snapshot_id
,
bool
teleport
)
>
url_callback_t
;
// Process incoming answers to map stuff requests
...
...
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