89fad5ded4
Merge
2010-04-07 17:09:46 -07:00
8bf3a6ad2b
EXT-6308 Drag and Drop cursor indicates you can drop a URL on a Shared Media prim that you are not allowed to Navigate
...
reviewd by Richard cc# 178
2010-04-07 15:03:27 -07:00
ff6c503c9a
EXT-4885 - [DnD] cannot drag slurls from Google Chrome into SL on windows
2010-04-07 10:17:05 -07:00
9523c70f9d
DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
...
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser). Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)
Also, refactor of voice to modularize it, and add a diamondware voice module.
CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-02 02:03:21 -07:00
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
6cc65f9e5f
merge
2010-04-01 12:52:04 -07:00
7b4046df83
EXT-3531 - Ctrl-P does not work reliably on login
2010-04-01 11:47:21 -07:00
3e23c04c9b
Merge from default branch
...
--HG--
branch : product-engine
2010-03-30 18:19:56 +03:00
86dc5bce1a
Automated merge
2010-03-29 16:24:58 -07:00
b6e7850c0a
Merge
2010-03-29 12:30:09 -04: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
b2a667b722
For EXT-4666: changed LLGestureManager to LLGestureMgr throughout
2010-03-29 11:10:54 -04:00
a5227864bd
Manual merge from default branch
...
Resolved conflict in indra/newview/llviewerwindow.cpp.
--HG--
branch : product-engine
2010-03-26 19:00:27 +02:00
0a56031bd3
automated merge
2010-03-25 20:15:51 -04:00
cc4a9b5640
EXT-2959 : Pull out camera functions from llagent to llagentcamera
...
#2 checkin.
Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).
2010-03-24 16:12:01 -04:00
e310350a2c
EXT-6404 - [TRANSPARENT MENU IN EN] Snapshot floater, all pull-down menus become transparent
...
reviewed by Leyla
2010-03-23 15:38:51 -07: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
0f32c14cab
Fixed normal bug EXT-6324 (View - View Object - should have "press ESC to return to World View" message) - added showing the "press ESC to return to World View" when viewer is in free camera mode (if mode was started by camera floater).
...
Reviewed by Leyla Farazha at https://codereview.productengine.com/secondlife/r/97/
--HG--
branch : product-engine
2010-03-25 12:06:39 +02:00
18b7ab0018
Weekly automated merge from viewer 2.0
2010-03-22 16:12:41 -07:00
63a0e89fb5
merge from hotfix to viewer-2-0 and resolve conflicts
2010-03-18 16:53:41 -04:00
04e692b3f1
Fixed bug EXT-6007 ([STRING IN EN] - While loading Second Life several messages need to be localized).
...
Reviewed by Richard: https://codereview.productengine.com/secondlife/r/31/
--HG--
branch : product-engine
2010-03-16 14:45:12 +02:00
1e5fe95b1d
EXT-6295 - Cannot log in with new account, TOS dialog does not load
...
reviewed by Mani
2010-03-10 18:20:18 -08:00
20379fecd9
automated merge
2010-03-08 21:39:38 -08:00
8bd5a3bca3
DEV-45976 Last Login Location Preference not remembered
2010-03-08 15:10:27 -08:00
7cea645ba2
added some logging to help track down crash in EXT-5849
2010-03-05 17:38:21 -08:00
27919e106a
fix for merge
2010-03-05 15:41:15 -08:00
931ff555bd
merge
2010-03-05 14:46:00 -08:00
485711e179
removed extraneous updateBoundingRect() calls
...
remove the login progress panel as a popup only after it has finished fading out
popupview manages it's own registering and unregistering of popup callbacks
2010-03-04 16:35:52 -08:00
69f9c0bcf9
WIP - replace top ctrl with LLPopupView
2010-03-03 19:37:41 -08:00
2281b187d3
fixed Normal Bug EXT-5603 Rightclick on link in long description cause following this link
...
Cause:
LLViewerWindow called handleMouseUp() instead handleAnyMouseClick(). It caused commit action in LLExpandableTextEditor even after right mouse up event.
Solution:
handleMouseUp() replaced by handleAnyMouseClick()
--HG--
branch : product-engine
2010-03-03 12:07:51 +02:00
41a30a59fb
initial work changing topctrl to popup layer
2010-03-02 14:21:58 -08:00
54a95f706f
merge
2010-02-23 17:19:58 -08:00
7885748497
Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3
2010-02-23 17:08:06 -08:00
0980df1e0c
merge
2010-02-23 17:07:18 -08:00
da79eb5545
Turning on Davep optimizations again. Backed out changeset d89b00b44ab6
2010-02-23 16:48:49 -08:00
79b6eea163
No ticket. Removed unnecessary string which was occasionally left in 5e7ce89a4c9e.
...
--HG--
branch : product-engine
2010-02-22 20:01:44 +02:00
16b284971e
Fixed normal bug EXT-4964 (Invalid SLURL detection does not detect invalid slurls).
...
- Added new static method LLSLURL::isValidSLURL() whic uses LLUrlRegistry::isUrl() to validate SLURLs and not just chek prefixes as LLSLURL::isSLURL() does.
- Used it in slurl DnD check in LLViewerWindow.
- LLUrlEntrySLURL regexp was changed not to pass non-valid SLURLS (such as one from the bug description).
--HG--
branch : product-engine
2010-02-22 19:22:43 +02:00
a7d716c35e
fixed EXT-5418 “When UI scale is set to 1.40 I see notices off the edge of the screen.”,
...
corrected emitting of world view update signal;
replaced getWorldViewRectRaw with getWorldViewRectScaled LLIMFloater::getAllowedRect;
--HG--
branch : product-engine
2010-02-22 18:23:04 +02:00
4dfed6e353
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
2010-02-16 15:43:11 -08:00
3b8463f0fd
merge
2010-02-12 21:06:25 -08:00
1f672990e7
Backed out davep's optimization pass. changeset 3c3685de430a
2010-02-12 21:06:02 -08:00
660c3b182c
merge
2010-02-12 21:05:09 -08:00
651b14fcae
Backed out davep's UI optimization. changeset 3134cb7bb181
2010-02-12 21:04:51 -08:00
6499aee37c
merge
2010-02-12 21:04:01 -08:00
b392e1c3bd
Backed out dave's FSAA/FBO change changeset 89f62bede16f
2010-02-12 21:03:43 -08:00
e159873eec
added popup panel to hold nearby media popup and stopped using top view
2010-02-12 16:54:47 -08:00
9aae3a31c8
merge
2010-02-12 15:56:25 -08:00
c0f2f151b2
"Fix for EXT-4968 - Media DnD cannot navigate prims owned by other people"
...
Reviewed by Rick via CodeCollab (http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=110 )
2010-02-12 15:24:53 -08:00
418504207b
merge
2010-02-12 15:16:19 -08:00
Leyla Farazha