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
00700bd4
Commit
00700bd4
authored
14 years ago
by
prep linden
Browse files
Options
Downloads
Patches
Plain Diff
misc cleanup
parent
f8182738
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/llfloaterpreference.cpp
+2
-3
2 additions, 3 deletions
indra/newview/llfloaterpreference.cpp
indra/newview/llfloaterpreference.h
+1
-2
1 addition, 2 deletions
indra/newview/llfloaterpreference.h
with
3 additions
and
5 deletions
indra/newview/llfloaterpreference.cpp
+
2
−
3
View file @
00700bd4
...
@@ -307,13 +307,13 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
...
@@ -307,13 +307,13 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar
.
add
(
"Pref.BlockList"
,
boost
::
bind
(
&
LLFloaterPreference
::
onClickBlockList
,
this
));
mCommitCallbackRegistrar
.
add
(
"Pref.BlockList"
,
boost
::
bind
(
&
LLFloaterPreference
::
onClickBlockList
,
this
));
sSkin
=
gSavedSettings
.
getString
(
"SkinCurrent"
);
sSkin
=
gSavedSettings
.
getString
(
"SkinCurrent"
);
//prep
LLAvatarPropertiesProcessor
::
getInstance
()
->
addObserver
(
gAgent
.
getID
(),
this
);
LLAvatarPropertiesProcessor
::
getInstance
()
->
addObserver
(
gAgent
.
getID
(),
this
);
LLAvatarPropertiesProcessor
::
getInstance
()
->
sendAvatarPropertiesRequest
(
gAgent
.
getID
()
);
LLAvatarPropertiesProcessor
::
getInstance
()
->
sendAvatarPropertiesRequest
(
gAgent
.
getID
()
);
}
}
//prep
void
LLFloaterPreference
::
processProperties
(
void
*
pData
,
EAvatarProcessorType
type
)
void
LLFloaterPreference
::
processProperties
(
void
*
pData
,
EAvatarProcessorType
type
)
{
{
if
(
APT_PROPERTIES
==
type
)
if
(
APT_PROPERTIES
==
type
)
...
@@ -493,7 +493,6 @@ void LLFloaterPreference::apply()
...
@@ -493,7 +493,6 @@ void LLFloaterPreference::apply()
}
}
}
}
//prep
saveAvatarProperties
();
saveAvatarProperties
();
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llfloaterpreference.h
+
1
−
2
View file @
00700bd4
...
@@ -78,7 +78,6 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver
...
@@ -78,7 +78,6 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver
// translate user's busy response message according to current locale if message is default, otherwise do nothing
// translate user's busy response message according to current locale if message is default, otherwise do nothing
static
void
initBusyResponse
();
static
void
initBusyResponse
();
//prep
void
processProperties
(
void
*
pData
,
EAvatarProcessorType
type
);
void
processProperties
(
void
*
pData
,
EAvatarProcessorType
type
);
void
processProfileProperties
(
const
LLAvatarData
*
pAvatarData
);
void
processProfileProperties
(
const
LLAvatarData
*
pAvatarData
);
void
storeAvatarProperties
(
const
LLAvatarData
*
pAvatarData
);
void
storeAvatarProperties
(
const
LLAvatarData
*
pAvatarData
);
...
@@ -157,7 +156,7 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver
...
@@ -157,7 +156,7 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver
bool
mOriginalHideOnlineStatus
;
bool
mOriginalHideOnlineStatus
;
std
::
string
mDirectoryVisibility
;
std
::
string
mDirectoryVisibility
;
//prep
LLAvatarData
mAvatarProperties
;
LLAvatarData
mAvatarProperties
;
};
};
...
...
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