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
fc3d27be
Commit
fc3d27be
authored
12 years ago
by
Oz Linden
Browse files
Options
Downloads
Plain Diff
merge changes for 3.4.2-beta2
parents
d35c4f4c
42b9001e
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
.hgtags
+3
-1
3 additions, 1 deletion
.hgtags
indra/newview/lldrawable.cpp
+3
-2
3 additions, 2 deletions
indra/newview/lldrawable.cpp
with
6 additions
and
3 deletions
.hgtags
+
3
−
1
View file @
fc3d27be
...
...
@@ -275,7 +275,6 @@ cbea6356ce9cb0c313b6777f10c5c14783264fcc DRTVWR-174
eb539c65e6ee26eea2bf373af2d0f4b52dc91289 DRTVWR-177
a8057e1b9a1246b434a27405be35e030f7d28b0c 3.3.4-beta3
888768f162d2c0a8de1dcc5fb9a08bd8bd120a6b DRTVWR-175
4ad8a3afe40e0200309e3ada68932c4295ac2795 DRTVWR-179
4281aa899fb2cedb7a9ca7ce91c5c29d4aa69594 DRTVWR-180
5c08e1d8edd871807153603b690e3ee9dbb548aa DRTVWR-183
6c75f220b103db1420919c8b635fe53e2177f318 3.3.4-beta4
...
...
@@ -329,6 +328,7 @@ f00068a66a2e2f72acbe3f690b98b323e740b289 DRTVWR-222
dd23d4da3bcb2ffda58569e759feb7c119982973 DRTVWR-224
0bd3744ff060452aa13ff4992eafb381df7b1012 3.4.1-beta5
29075f8c1abed53dcf195a59f61744e27a91108f DRTVWR-226
fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179
49ed253c80bed7410e238eeab35a9f14cb034364 3.4.1-beta6
468ca3268229011a59df99229b24315844b33d34 DRTVWR-227
524da902713e8b60322640b9825101add4a7c497 3.4.1-beta7
...
...
@@ -348,3 +348,5 @@ e59ffd3fe0838ae6b09b242a6e9df71761b88f41 3.4.1-release
704bbae7b182a1f2811a47a054e680522966f54a 3.4.2-beta1
d799593b53ed733862e9a13871e318e886469377 DRTVWR-208
e497dcde7a3653e384eb223a8a460030e89c294c DRTVWR-223
288539fc0408ed4b69a99665de33bbbc2c3c08fe DRTVWR-216
e664473c16df1d82ffaff382e7b3e023da202d52 3.4.2-beta2
This diff is collapsed.
Click to expand it.
indra/newview/lldrawable.cpp
+
3
−
2
View file @
fc3d27be
...
...
@@ -624,7 +624,9 @@ BOOL LLDrawable::updateMove()
{
return
FALSE
;
}
makeActive
();
BOOL
done
;
if
(
isState
(
MOVE_UNDAMPED
))
...
...
@@ -633,7 +635,6 @@ BOOL LLDrawable::updateMove()
}
else
{
makeActive
();
done
=
updateMoveDamped
();
}
return
done
;
...
...
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