532d732645
merge from viewer-hotfix
2010-04-19 14:22:05 +01:00
ea6a3e8e78
Updated the reverted fix for critical bug EXT-1655 ([BSI] Always flying after pressing "Stand" to stand up from an object), also integrated the fix for EXT-6786 ('Stand' button is corrupted if movement control floater is opened). Added some clarifying comments.
...
Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/253/ .
--HG--
branch : product-engine
2010-04-19 13:32:07 +03:00
d69084d5d8
Reverted fix of EXT-1655 (because it causes EXT-6835)
...
--HG--
branch : product-engine
2010-04-16 19:28:37 +03:00
adce2ecdf8
PE merge from pe-viewer-trunk
2010-04-07 13:03:35 +01:00
7dd71a60c5
Fixed critical bug EXT-1655 ([BSI] Always flying after pressing "Stand" to stand up from an object)
...
- moved restoring the flying of the agent before calling the mAutoPilotFinishedCallback, to allow finished callback to change it.
- fixed LLVOAvatar::sitOnObject() to set mIsSitting = TRUE before stoping the autopilot, like it was in 1.23 version.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/185/
--HG--
branch : product-engine
2010-04-07 13:38:21 +03:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01: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
bba457e889
Merge from default branch
...
--HG--
branch : product-engine
2010-03-31 10:08:50 +03:00
b0d2cd38f0
EXT-6634 : INFRASTRUCTURE: Generic header file / #include cleanup
...
LLAgent.* cleanup
Also took out some constants from llagent.cpp that aren't being used.
2010-03-30 15:21:53 -04:00
b15e34b942
EXT-6630 : INFRASTRUCTURE: Pull out -Keys functions from llagent into llagentcamera
...
Orbit/Pan keys were already in llagentcamera. Pulled alt/walk/left/up/yaw/pitch into llagentcamera.
2010-03-30 14:21:20 -04:00
3e23c04c9b
Merge from default branch
...
--HG--
branch : product-engine
2010-03-30 18:19:56 +03: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
0bcfbde3a4
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Lots of superficial cleanup, particularly around "if (" formatting.
Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
2010-03-26 13:58:19 -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
885fc3f9b5
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-03-25 19:56:52 -04:00
853d9e4453
EXT-6539 : Take out mAvatarObject from LLAgentWearables
...
Removed mAvatarObject / gAgentWearables.mAvatarObject since it's redundant with gAgent.mAvatarObject.
2010-03-25 17:27:50 -04:00
504cf0870d
EXT-2959 : Pull out camera functions from llagent to llagentcamera
...
#3 checkin.
Took out llagent "friend llagentcamera" and added accessors instead.
Did some superficial formatting cleanup.
2010-03-25 15:06:48 -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
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
7fa6e0ad6c
Fixed normal bug EXT-5840 (Search floater auto-closes on telelport) - removed the closing of search floater at teleportation request.
...
Reviewed by Leyla Farazha at https://codereview.productengine.com/secondlife/r/94/
--HG--
branch : product-engine
2010-03-24 21:03:50 +02:00
20379fecd9
automated merge
2010-03-08 21:39:38 -08:00
40230fa605
EXT-5847 failure to bake when standard wearables are generated
...
Standard wearables have no textures associated with them. No textures means no texture callbacks.
Fixed the issue by requesting a texture upload on baked textures that we don't get a cahced baked
texture response for. This clears up the repro
Code reviewed by prep, vir
2010-03-05 10:25:30 -05:00
213ff5a4e0
EXT-5820 I can copy asset UUID from non-FULLPERM assets turning on admin mode.
...
If you're reading this message, this was reviewed by Soft, Nyx or Aura. :)
2010-02-26 19:23:42 +00: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
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
418504207b
merge
2010-02-12 15:16:19 -08:00
318a88f57b
fix typos in EXT-5248 / d6fd7b96d638
2010-02-12 19:32:26 +00:00
5a5262bbdc
Fixed normal bug EXT - 5248 (Default group icon for IM sessions in multifloater). The problem was in LLAgent::isInGroup() logic. In God Mode it always returned true, even if it was not so. Added ability to ignore God Mode in LLAgent::isInGroup().
...
--HG--
branch : product-engine
2010-02-12 16:24:24 +02:00
51499b555a
CID-65
...
Checker: FORWARD_NULL
Function: LLAgent::sendMessage()
File: /indra/newview/llagent.cpp
not a bug.
2010-02-10 18:12:15 +00:00
f040942f19
EXT-4449 [BSI] Zoom In does not function properly on large or linked prim sets
...
reviewed by Richard CC#99
2010-02-09 15:55:33 -08:00
8e67ecf3dc
Optimization pass.
...
-- Further instrumentation of idle update
-- Removed mActiveQ from LLPipeline, instead making calm objects static during LLVOVolume::idleUpdate
-- Further instrumentation of flexible object update
-- Converted LLDynamicArray and LLMap members of LLViewerObjectList to stl counterparts
-- Increased number of update bins in LLViewerObjectList from 16 to 128 (objects will be processed every 128 frames instead of every 16, or ~ 90% fewer objects processed per frame)
-- Removed unused "renderObjectsForSelect" code.
-- Reenabled LOD updates for objects further than 24m from camera
2010-02-03 12:33:32 -06:00
d3eb0e9765
Fixed normal bug EXT-4697 (Buttons in bottom bar are compressed after quitting mouselook mode) and low bug EXT-4723 (Not all buttons are displayed on the bottom bar after leaving mouse look): - implemented the LLBottomTrayLite, which appears only in mouselook mode.
...
--HG--
branch : product-engine
2010-01-29 19:55:41 +02:00
97f35b18f0
Merge from default branch.
...
--HG--
branch : product-engine
2010-01-18 14:51:26 +02:00
109b79e9ad
merge
2010-01-15 10:15:57 -08:00
2b5f45c1aa
Fixed normal bug EXT-4309 (Gesture button is too wide in the mouse look mode): added hack that avoid usage of the LLLayoutStack resizing logic on mouse look mode switching.
...
--HG--
branch : product-engine
2010-01-15 20:57:42 +02:00
a9f532b2ea
fixed major bug EXT-4194 Escape key does not reset the camera FOV
...
--HG--
branch : product-engine
2010-01-14 13:57:16 +02:00
82b073be87
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
2010-01-14 11:40:58 +08:00
433eb89473
EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc)
2010-01-14 09:38:46 +08:00
1f5e82e140
Partially fixed major bug EXT-4112 ([BSI] Number of groups not limited to 25).
...
Viewer now disallows joining or creating groups if the limit reached.
A server-side fix is also needed.
--HG--
branch : product-engine
2010-01-12 20:01:10 +02:00
7669c07572
EXT-3667 Usability : Returning back from mousehook does not set the user back to See as Avatar
...
--HG--
branch : product-engine
2010-01-05 15:47:12 +02:00
8f30d5f204
EXT-2781. Added reference to issue in comments.
...
--HG--
branch : product-engine
2009-12-30 14:38:22 +02:00
383cb255e0
Fixed low bug (EXT-2781) Stop Flying button is displayed while walking after slumping.
...
- Disabled flying mode if it has been enabled shortly before the agent
stand up animation is signaled. In this case we don't get a signal to start flying animation because of some server side problem, the agent's avatar does not play flying animation, so we switch flying mode off. This may cause "Stop Flying" button to blink.
--HG--
branch : product-engine
2009-12-29 20:47:11 +02:00
1147cb1afb
Automated merge from trunk
2010-03-01 18:09:04 -08:00
b11a625e6f
Automated merge with a few fixups for code review comments
2010-03-01 15:31:04 -08:00
a2efe4bb41
automated merge
2010-02-26 19:18:15 -08:00
5c73a90835
automated merge
2010-02-25 21:20:45 -08:00
Tofu Linden