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
6dd243e3
Commit
6dd243e3
authored
10 months ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix parcel audio url not being copyable
parent
ebfedd72
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llpanellandaudio.cpp
+17
-6
17 additions, 6 deletions
indra/newview/llpanellandaudio.cpp
with
17 additions
and
6 deletions
indra/newview/llpanellandaudio.cpp
+
17
−
6
View file @
6dd243e3
...
@@ -154,16 +154,19 @@ void LLPanelLandAudio::refresh()
...
@@ -154,16 +154,19 @@ void LLPanelLandAudio::refresh()
const
std
::
string
&
current_url
=
parcel
->
getMusicURL
();
const
std
::
string
&
current_url
=
parcel
->
getMusicURL
();
mMusicURLEdit
->
clearRows
();
mMusicURLEdit
->
clearRows
();
LLSD
stream_list
=
gSavedSettings
.
getLLSD
(
"StreamList"
);
if
(
can_change_media
)
const
LLSD
streams
=
stream_list
[
"audio"
];
for
(
LLSD
::
array_const_iterator
s_itr
=
streams
.
beginArray
(),
s_end
=
streams
.
endArray
();
s_itr
!=
s_end
;
++
s_itr
)
{
{
mMusicURLEdit
->
add
(
LLSD
(
*
s_itr
));
LLSD
stream_list
=
gSavedSettings
.
getLLSD
(
"StreamList"
);
const
LLSD
streams
=
stream_list
[
"audio"
];
for
(
LLSD
::
array_const_iterator
s_itr
=
streams
.
beginArray
(),
s_end
=
streams
.
endArray
();
s_itr
!=
s_end
;
++
s_itr
)
{
mMusicURLEdit
->
add
(
LLSD
(
*
s_itr
));
}
mMusicURLEdit
->
addSeparator
(
ADD_TOP
);
}
}
mMusicURLEdit
->
addSeparator
(
ADD_TOP
);
mMusicURLEdit
->
add
(
LLSD
(
current_url
),
ADD_TOP
);
mMusicURLEdit
->
add
(
LLSD
(
current_url
),
ADD_TOP
);
mMusicURLEdit
->
selectByValue
(
current_url
);
mMusicURLEdit
->
selectByValue
(
current_url
);
mMusicURLEdit
->
setEnabled
(
can_change_media
);
mMusicURLEdit
->
setEnabled
(
TRUE
);
BOOL
can_change_av_sounds
=
LLViewerParcelMgr
::
isParcelModifiableByAgent
(
parcel
,
GP_LAND_OPTIONS
)
&&
parcel
->
getHaveNewParcelLimitData
();
BOOL
can_change_av_sounds
=
LLViewerParcelMgr
::
isParcelModifiableByAgent
(
parcel
,
GP_LAND_OPTIONS
)
&&
parcel
->
getHaveNewParcelLimitData
();
mCheckAVSoundAny
->
set
(
parcel
->
getAllowAnyAVSounds
());
mCheckAVSoundAny
->
set
(
parcel
->
getAllowAnyAVSounds
());
...
@@ -224,6 +227,14 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
...
@@ -224,6 +227,14 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
void
LLPanelLandAudio
::
onCommitMusicUrl
()
void
LLPanelLandAudio
::
onCommitMusicUrl
()
{
{
LLParcel
*
parcel
=
mParcel
->
getParcel
();
if
(
!
parcel
)
return
;
BOOL
can_change_media
=
LLViewerParcelMgr
::
isParcelModifiableByAgent
(
parcel
,
GP_LAND_CHANGE_MEDIA
);
if
(
!
can_change_media
)
return
;
std
::
string
music_url
=
mMusicURLEdit
->
getSimple
();
std
::
string
music_url
=
mMusicURLEdit
->
getSimple
();
LLStringUtil
::
trim
(
music_url
);
LLStringUtil
::
trim
(
music_url
);
if
(
!
music_url
.
empty
())
if
(
!
music_url
.
empty
())
...
...
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