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
1082a886
Commit
1082a886
authored
5 years ago
by
Oz Linden
Browse files
Options
Downloads
Patches
Plain Diff
tag initialization and bugsplat related logging
parent
2961fea6
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llappviewermacosx.cpp
+7
-7
7 additions, 7 deletions
indra/newview/llappviewermacosx.cpp
with
7 additions
and
7 deletions
indra/newview/llappviewermacosx.cpp
+
7
−
7
View file @
1082a886
...
@@ -91,7 +91,7 @@ void constructViewer()
...
@@ -91,7 +91,7 @@ void constructViewer()
// Set the working dir to <bundle>/Contents/Resources
// Set the working dir to <bundle>/Contents/Resources
if
(
chdir
(
gDirUtilp
->
getAppRODataDir
().
c_str
())
==
-
1
)
if
(
chdir
(
gDirUtilp
->
getAppRODataDir
().
c_str
())
==
-
1
)
{
{
LL_WARNS
()
<<
"Could not change directory to "
LL_WARNS
(
"InitOSX"
)
<<
"Could not change directory to "
<<
gDirUtilp
->
getAppRODataDir
()
<<
": "
<<
strerror
(
errno
)
<<
gDirUtilp
->
getAppRODataDir
()
<<
": "
<<
strerror
(
errno
)
<<
LL_ENDL
;
<<
LL_ENDL
;
}
}
...
@@ -109,7 +109,7 @@ bool initViewer()
...
@@ -109,7 +109,7 @@ bool initViewer()
bool
ok
=
gViewerAppPtr
->
init
();
bool
ok
=
gViewerAppPtr
->
init
();
if
(
!
ok
)
if
(
!
ok
)
{
{
LL_WARNS
()
<<
"Application init failed."
<<
LL_ENDL
;
LL_WARNS
(
"InitOSX"
)
<<
"Application init failed."
<<
LL_ENDL
;
}
}
else
if
(
!
gHandleSLURL
.
empty
())
else
if
(
!
gHandleSLURL
.
empty
())
{
{
...
@@ -172,7 +172,7 @@ class CrashMetadataSingleton: public CrashMetadata, public LLSingleton<CrashMeta
...
@@ -172,7 +172,7 @@ class CrashMetadataSingleton: public CrashMetadata, public LLSingleton<CrashMeta
std
::
string
get_metadata
(
const
LLSD
&
info
,
const
LLSD
::
String
&
key
)
const
std
::
string
get_metadata
(
const
LLSD
&
info
,
const
LLSD
::
String
&
key
)
const
{
{
std
::
string
data
(
info
[
key
].
asString
());
std
::
string
data
(
info
[
key
].
asString
());
LL_INFOS
()
<<
" "
<<
key
<<
"='"
<<
data
<<
"'"
<<
LL_ENDL
;
LL_INFOS
(
"Bugsplat"
)
<<
" "
<<
key
<<
"='"
<<
data
<<
"'"
<<
LL_ENDL
;
return
data
;
return
data
;
}
}
};
};
...
@@ -188,17 +188,17 @@ CrashMetadataSingleton::CrashMetadataSingleton()
...
@@ -188,17 +188,17 @@ CrashMetadataSingleton::CrashMetadataSingleton()
LLSD
info
;
LLSD
info
;
if
(
!
static_file
.
is_open
())
if
(
!
static_file
.
is_open
())
{
{
LL_WARNS
()
<<
"Can't open '"
<<
staticDebugPathname
LL_WARNS
(
"Bugsplat"
)
<<
"Can't open '"
<<
staticDebugPathname
<<
"'; no metadata about previous run"
<<
LL_ENDL
;
<<
"'; no metadata about previous run"
<<
LL_ENDL
;
}
}
else
if
(
!
LLSDSerialize
::
deserialize
(
info
,
static_file
,
LLSDSerialize
::
SIZE_UNLIMITED
))
else
if
(
!
LLSDSerialize
::
deserialize
(
info
,
static_file
,
LLSDSerialize
::
SIZE_UNLIMITED
))
{
{
LL_WARNS
()
<<
"Can't parse '"
<<
staticDebugPathname
LL_WARNS
(
"Bugsplat"
)
<<
"Can't parse '"
<<
staticDebugPathname
<<
"'; no metadata about previous run"
<<
LL_ENDL
;
<<
"'; no metadata about previous run"
<<
LL_ENDL
;
}
}
else
else
{
{
LL_INFOS
()
<<
"Previous run metadata from '"
<<
staticDebugPathname
<<
"':"
<<
LL_ENDL
;
LL_INFOS
(
"Bugsplat"
)
<<
"Previous run metadata from '"
<<
staticDebugPathname
<<
"':"
<<
LL_ENDL
;
logFilePathname
=
get_metadata
(
info
,
"SLLog"
);
logFilePathname
=
get_metadata
(
info
,
"SLLog"
);
userSettingsPathname
=
get_metadata
(
info
,
"SettingsFilename"
);
userSettingsPathname
=
get_metadata
(
info
,
"SettingsFilename"
);
OSInfo
=
get_metadata
(
info
,
"OSInfo"
);
OSInfo
=
get_metadata
(
info
,
"OSInfo"
);
...
@@ -218,7 +218,7 @@ CrashMetadata& CrashMetadata_instance()
...
@@ -218,7 +218,7 @@ CrashMetadata& CrashMetadata_instance()
void
infos
(
const
std
::
string
&
message
)
void
infos
(
const
std
::
string
&
message
)
{
{
LL_INFOS
()
<<
message
<<
LL_ENDL
;
LL_INFOS
(
"InitOSX"
,
"Bugsplat"
)
<<
message
<<
LL_ENDL
;
}
}
int
main
(
int
argc
,
char
**
argv
)
int
main
(
int
argc
,
char
**
argv
)
...
...
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