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
370620c5
Commit
370620c5
authored
10 years ago
by
Merov Linden
Browse files
Options
Downloads
Patches
Plain Diff
DD-19 : Revalidate the marketplace when reopening the Audit floater
parent
59f512b3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llfloatermarketplacelistings.cpp
+12
-6
12 additions, 6 deletions
indra/newview/llfloatermarketplacelistings.cpp
indra/newview/llfloatermarketplacelistings.h
+1
-0
1 addition, 0 deletions
indra/newview/llfloatermarketplacelistings.h
with
13 additions
and
6 deletions
indra/newview/llfloatermarketplacelistings.cpp
+
12
−
6
View file @
370620c5
...
@@ -597,12 +597,6 @@ BOOL LLFloaterMarketplaceValidation::postBuild()
...
@@ -597,12 +597,6 @@ BOOL LLFloaterMarketplaceValidation::postBuild()
mEditor
->
setFocus
(
TRUE
);
mEditor
->
setFocus
(
TRUE
);
mEditor
->
setValue
(
LLSD
());
mEditor
->
setValue
(
LLSD
());
// Validates the marketplace
LLUUID
marketplacelistings_id
=
gInventory
.
findCategoryUUIDForType
(
LLFolderType
::
FT_MARKETPLACE_LISTINGS
,
true
);
llassert
(
marketplacelistings_id
.
notNull
());
LLViewerInventoryCategory
*
cat
=
gInventory
.
getCategory
(
marketplacelistings_id
);
validate_marketplacelistings
(
cat
,
boost
::
bind
(
&
LLFloaterMarketplaceValidation
::
appendMessage
,
this
,
_1
));
return
TRUE
;
return
TRUE
;
}
}
...
@@ -617,6 +611,18 @@ void LLFloaterMarketplaceValidation::draw()
...
@@ -617,6 +611,18 @@ void LLFloaterMarketplaceValidation::draw()
LLFloater
::
draw
();
LLFloater
::
draw
();
}
}
void
LLFloaterMarketplaceValidation
::
onOpen
(
const
LLSD
&
key
)
{
// Clear the text panel
mEditor
->
setValue
(
LLSD
());
// Validates the marketplace
LLUUID
marketplacelistings_id
=
gInventory
.
findCategoryUUIDForType
(
LLFolderType
::
FT_MARKETPLACE_LISTINGS
,
true
);
llassert
(
marketplacelistings_id
.
notNull
());
LLViewerInventoryCategory
*
cat
=
gInventory
.
getCategory
(
marketplacelistings_id
);
validate_marketplacelistings
(
cat
,
boost
::
bind
(
&
LLFloaterMarketplaceValidation
::
appendMessage
,
this
,
_1
));
}
// static
// static
void
LLFloaterMarketplaceValidation
::
onOK
(
void
*
userdata
)
void
LLFloaterMarketplaceValidation
::
onOK
(
void
*
userdata
)
{
{
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llfloatermarketplacelistings.h
+
1
−
0
View file @
370620c5
...
@@ -162,6 +162,7 @@ class LLFloaterMarketplaceValidation : public LLFloater
...
@@ -162,6 +162,7 @@ class LLFloaterMarketplaceValidation : public LLFloater
virtual
BOOL
postBuild
();
virtual
BOOL
postBuild
();
virtual
void
draw
();
virtual
void
draw
();
virtual
void
onOpen
(
const
LLSD
&
key
);
void
appendMessage
(
std
::
string
&
message
);
void
appendMessage
(
std
::
string
&
message
);
static
void
onOK
(
void
*
userdata
);
static
void
onOK
(
void
*
userdata
);
...
...
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