b157ab47c0
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llagentui.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llfloateravatarrendersettings.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/de/floater_tools.xml
# indra/newview/skins/default/xui/en/floater_display_name.xml
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/ru/floater_tools.xml
2023-01-12 16:56:08 +01:00
5bfe93b4ea
SL-18159 Windows' mouse from keyboard emulation causes pointer to jump around the screen.
...
Emulated mouse was trigering "not a valid zoomable object" case and jumping to garbage mMouseDownX/Y due to 'up' event being too early.
2022-12-11 19:08:48 +02:00
ebe141327c
Merge branch 'DRTVWR-514-keymappings' of https://bitbucket.org/lindenlab/viewer
2020-06-24 10:30:51 +02:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
9203b70ca3
Merge viewer-neko
2018-04-07 13:40:21 +02:00
faceb7112e
MAINT-8477 FIXED "Zoom" in build tab rotates around the avatar, instead of zooming
2018-04-04 18:22:34 +03:00
e18d32ee13
Merge viewer-bear
2016-09-12 20:58:57 +02:00
8bb95eb8f8
MAINT-6711 "Object view" rotates around the avatar
2016-09-09 16:17:43 +03:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
57f139b608
Merge viewer-bear
2015-12-03 09:41:20 +01:00
749a0266ba
MAINT-5892 Added the comments to the function parameters
2015-11-24 18:27:45 +02:00
4fe7d8b2e9
MAINT-5892 FIXED Alt camming on rigged mesh makes the camera judder, get stuck or fly off into the distance.
2015-11-23 08:33:55 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
68739bc569
Merge Viewer-Bear
2015-10-27 01:31:15 +01:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
404f4a7845
FIRE-12964: Manual pull of MAINT-3800 because it interferes with rigged mesh attachment selection
...
Also adjust calls of pickImmediate and pickAsync methods to account particle selection that was added after rigged mesh attachment selection
2015-04-06 20:21:50 +02:00
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
577a3973ea
Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-10-20 14:00:39 -07:00
513fd3a622
MAINT-3800 FIXED Remove the draw distance reference in the viewer when alt-camming on terrain.
2014-10-13 16:40:33 +03:00
3686dc3e37
MAINT-3634 FIXED After right-clicking another avatars nametag or avatar then pressing the "Alt" key, most options in the dropdown menu will no longer function.
2014-06-16 20:38:43 +03:00
04bd614541
FIRE-14929: Pull missing changes to make mouse walk work correctly
2014-11-10 12:25:49 +01:00
5b6f5be3f1
Fix EOL
2014-11-07 19:43:13 +01:00
e7466b0f06
Mouse walk, run and fly by Siana of Singularity.
2014-11-07 12:44:56 -05:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
3073c750ae
Some more caching of frequently called gSavedSettings
2013-09-06 20:31:24 +02:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
6dd35018d2
EXT-7767 FIX Outfit editor doesn't appear to have a default camera view
...
added some comments and cleaned up code based on review
2010-06-23 18:32:31 -07:00
58d76a9ecf
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
94e6e10739
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
46fe5d49ca
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
fc49539b36
EXT-2959 : Full out camera functions from llagent to llagentcamera
...
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
b38ca5ec32
fix for UI scale != 1.0 breaking edit tools, web browser, world view rect, etc.
2009-11-16 15:47:45 -08:00
0f6242d9fd
Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
...
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
58bce2d205
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-09 01:26:44 +00:00
db5cda2667
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3
...
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
2009-08-03 22:25:48 +00:00
d6101558a1
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
...
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
6db6d81b0a
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
...
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-03-05 00:29:27 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
52562e2e66
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
...
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00
35b4a91129
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
...
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22 20:55:02 +00:00
Ansariel