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
09c7d381
Commit
09c7d381
authored
14 years ago
by
Jonathan Yap
Browse files
Options
Downloads
Patches
Plain Diff
STORM-467 Fix for minimap zoom does not persist to the next session
parent
452d9d5e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/contributions.txt
+1
-0
1 addition, 0 deletions
doc/contributions.txt
indra/newview/llfloatermap.cpp
+0
-2
0 additions, 2 deletions
indra/newview/llfloatermap.cpp
indra/newview/llnetmap.cpp
+2
-0
2 additions, 0 deletions
indra/newview/llnetmap.cpp
with
3 additions
and
2 deletions
doc/contributions.txt
+
1
−
0
View file @
09c7d381
...
@@ -735,6 +735,7 @@ Tue Torok
...
@@ -735,6 +735,7 @@ Tue Torok
CT-74
CT-74
Twisted Laws
Twisted Laws
SNOW-352
SNOW-352
STORM-467
Vadim Bigbear
Vadim Bigbear
VWR-2681
VWR-2681
Vector Hastings
Vector Hastings
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llfloatermap.cpp
+
0
−
2
View file @
09c7d381
...
@@ -83,7 +83,6 @@ LLFloaterMap::~LLFloaterMap()
...
@@ -83,7 +83,6 @@ LLFloaterMap::~LLFloaterMap()
BOOL
LLFloaterMap
::
postBuild
()
BOOL
LLFloaterMap
::
postBuild
()
{
{
mMap
=
getChild
<
LLNetMap
>
(
"Net Map"
);
mMap
=
getChild
<
LLNetMap
>
(
"Net Map"
);
mMap
->
setScale
(
gSavedSettings
.
getF32
(
"MiniMapScale"
));
mMap
->
setToolTipMsg
(
getString
(
"ToolTipMsg"
));
mMap
->
setToolTipMsg
(
getString
(
"ToolTipMsg"
));
sendChildToBack
(
mMap
);
sendChildToBack
(
mMap
);
...
@@ -296,7 +295,6 @@ void LLFloaterMap::handleZoom(const LLSD& userdata)
...
@@ -296,7 +295,6 @@ void LLFloaterMap::handleZoom(const LLSD& userdata)
scale
=
LLNetMap
::
MAP_SCALE_MIN
;
scale
=
LLNetMap
::
MAP_SCALE_MIN
;
if
(
scale
!=
0.0
f
)
if
(
scale
!=
0.0
f
)
{
{
gSavedSettings
.
setF32
(
"MiniMapScale"
,
scale
);
mMap
->
setScale
(
scale
);
mMap
->
setScale
(
scale
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llnetmap.cpp
+
2
−
0
View file @
09c7d381
...
@@ -94,10 +94,12 @@ LLNetMap::LLNetMap (const Params & p)
...
@@ -94,10 +94,12 @@ LLNetMap::LLNetMap (const Params & p)
mToolTipMsg
()
mToolTipMsg
()
{
{
mDotRadius
=
llmax
(
DOT_SCALE
*
mPixelsPerMeter
,
MIN_DOT_RADIUS
);
mDotRadius
=
llmax
(
DOT_SCALE
*
mPixelsPerMeter
,
MIN_DOT_RADIUS
);
setScale
(
gSavedSettings
.
getF32
(
"MiniMapScale"
));
}
}
LLNetMap
::~
LLNetMap
()
LLNetMap
::~
LLNetMap
()
{
{
gSavedSettings
.
setF32
(
"MiniMapScale"
,
mScale
);
}
}
void
LLNetMap
::
setScale
(
F32
scale
)
void
LLNetMap
::
setScale
(
F32
scale
)
...
...
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