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
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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 Archive
Alchemy Viewer
Commits
d584d58e
Commit
d584d58e
authored
6 years ago
by
maxim_productengine
Browse files
Options
Downloads
Patches
Plain Diff
mac build fixes
parent
bbc49ea0
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/lldirpicker.cpp
+12
-12
12 additions, 12 deletions
indra/newview/lldirpicker.cpp
indra/newview/lldirpicker.h
+1
-1
1 addition, 1 deletion
indra/newview/lldirpicker.h
with
13 additions
and
13 deletions
indra/newview/lldirpicker.cpp
+
12
−
12
View file @
d584d58e
...
@@ -92,7 +92,7 @@ LLDirPicker::~LLDirPicker()
...
@@ -92,7 +92,7 @@ LLDirPicker::~LLDirPicker()
// nothing
// nothing
}
}
BOOL
LLDirPicker
::
getDir
(
std
::
string
filename
,
bool
blocking
)
BOOL
LLDirPicker
::
getDir
(
std
::
string
*
filename
,
bool
blocking
)
{
{
if
(
mLocked
)
if
(
mLocked
)
{
{
...
@@ -175,7 +175,7 @@ void LLDirPicker::reset()
...
@@ -175,7 +175,7 @@ void LLDirPicker::reset()
//static
//static
BOOL
LLDirPicker
::
getDir
(
std
::
string
*
filename
)
BOOL
LLDirPicker
::
getDir
(
std
::
string
*
filename
,
bool
blocking
)
{
{
LLFilePicker
::
ELoadFilter
filter
=
LLFilePicker
::
FFLOAD_DIRECTORY
;
LLFilePicker
::
ELoadFilter
filter
=
LLFilePicker
::
FFLOAD_DIRECTORY
;
...
@@ -209,7 +209,7 @@ void LLDirPicker::reset()
...
@@ -209,7 +209,7 @@ void LLDirPicker::reset()
mFilePicker
->
reset
();
mFilePicker
->
reset
();
}
}
BOOL
LLDirPicker
::
getDir
(
std
::
string
*
filename
)
BOOL
LLDirPicker
::
getDir
(
std
::
string
*
filename
,
bool
blocking
)
{
{
reset
();
reset
();
...
@@ -264,7 +264,7 @@ void LLDirPicker::reset()
...
@@ -264,7 +264,7 @@ void LLDirPicker::reset()
{
{
}
}
BOOL
LLDirPicker
::
getDir
(
std
::
string
*
filename
)
BOOL
LLDirPicker
::
getDir
(
std
::
string
*
filename
,
bool
blocking
)
{
{
return
FALSE
;
return
FALSE
;
}
}
...
@@ -300,7 +300,7 @@ void LLDirPickerThread::run()
...
@@ -300,7 +300,7 @@ void LLDirPickerThread::run()
LLDirPicker
picker
;
LLDirPicker
picker
;
if
(
picker
.
getDir
(
mProposedName
,
blocking
))
if
(
picker
.
getDir
(
&
mProposedName
,
blocking
))
{
{
mResponses
.
push_back
(
picker
.
getDirName
());
mResponses
.
push_back
(
picker
.
getDirName
());
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/newview/lldirpicker.h
+
1
−
1
View file @
d584d58e
...
@@ -60,7 +60,7 @@ public:
...
@@ -60,7 +60,7 @@ public:
// calling this before main() is undefined
// calling this before main() is undefined
static
LLDirPicker
&
instance
(
void
)
{
return
sInstance
;
}
static
LLDirPicker
&
instance
(
void
)
{
return
sInstance
;
}
BOOL
getDir
(
std
::
string
filename
,
bool
blocking
=
true
);
BOOL
getDir
(
std
::
string
*
filename
,
bool
blocking
=
true
);
std
::
string
getDirName
();
std
::
string
getDirName
();
// clear any lists of buffers or whatever, and make sure the dir
// clear any lists of buffers or whatever, and make sure the dir
...
...
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