Commit Graph

499 Commits (14ddfcdf5237c9529d8a8edbd4c86cfd53cfaf78)

Author SHA1 Message Date
maksymsproductengine 5f08b05533 CHUI-743 FIXED CHUI viewer ignores pre chui users Privacy settings to not keep IM logs and nearby chat logs 2013-02-13 12:10:21 +02:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Merov Linden bb322a1ccc CHUI-580 : Fixed : Clean up the use of display name. Allow the use of the legacy protocol in settings.xml 2012-12-07 00:10:50 -08:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08:00
AlexanderP ProductEngine 04dee1bad9 CHUI-504 FIXED Open Conversation floater on first login.
added toggleInstanceOrBringToFront("im_container") to LLStartup;
typo corr.
2012-12-04 20:49:42 +02:00
William Todd Stinson 67bc42a80a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-20 16:20:40 -08:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
AlexanderP ProductEngine 486bdf3284 CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00
Nat Goodspeed 55a812ca77 Automated merge with http://hg.secondlife.com/viewer-development 2012-11-06 16:37:51 -05:00
Nat Goodspeed fdddd37db0 Remove HelpUseLocal setting variable. Hide local html skin dir.
We assert that the local html directory is no longer used. Remove machinery
related to its use, notably HelpUseLocal, the code that checks it and the
code that sets and examines special flag URL "__local".
Before actually killing off the local skins/default/html directory, make
viewer_manifest.py rename it but continue packaging it as html.old. If this
doesn't cause a panic, we can proceed with removing it entirely.
2012-10-10 17:18:26 -04:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Richard Linden 93578f7e51 Automated merge with http://bitbucket.org/lindenlab/viewer-cat 2012-08-24 16:31:29 -07:00
AlexanderP ProductEngine 14708a3ace CHUI_310 make NearbyChat a singletone 2012-08-22 18:27:29 +03:00
Todd Stinson 6d84272d38 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-23 15:11:10 -07:00
Oz Linden 97106c2dea merge changes for DRTVWR-194 2012-08-15 17:07:10 -04:00
Oz Linden 981190cf31 merge back beta fixes 2012-08-14 18:41:25 -04:00
Oz Linden 5f1230e911 MAINT-1342: correct initial login location handling, clarify the two related persistent settings 2012-08-09 11:52:48 -07:00
Todd Stinson 9488baada3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-09 12:06:09 -07:00
Nat Goodspeed f1ff284569 Automated merge with http://hg.secondlife.com/viewer-development 2012-08-02 13:23:46 -04:00
Brad Payne (Vir Linden) 58d5e223b8 merge 2012-07-30 15:02:02 -04:00
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
Todd Stinson c1aa0cc4fc Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-07-27 15:38:03 -07:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Paul ProductEngine 0ee0a5eff4 CHUI-151 FIXED (Implement conversation log)
A brief explanation of what have been implemented. More information can be found in comments.

1. Created conversation history viewer (llfloaterconversationpreview)
2. Created LLConversation and LLConversationLog classes which represent and hold data of conversations (llconversationlog)
3. Created LLConversationLogList and LLConversationLogListItem which are the visual representation of LLConversationLog and LLConversation respectively
4. Created LLFloaterConversationLog - which holds and displays LLConversationLogList
2012-07-27 22:25:17 +03:00
Nat Goodspeed 300662919e Engage dormant first-login-this-install popup message.
Although the XUI for this popup, and the code to display and respond to it,
have been present from the first rev in the current viewer repository, I can
find no trace of it ever having been called.
Reword embedded link in popup message in each supported language: directly
mentioning secondlife.com in display text engages anti-URL-spoofing logic,
causing the popup to display the whole messy URL with sourceid and lang
params. Change to say "Second Life web site" instead -- needs translations.
2012-07-24 08:54:01 -04:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Richard Linden df7d6c9075 SH-3275 WIP Run viewer metrics for object update messages
continued clean up of llstats stuff
2012-07-18 12:37:52 -07:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Oz Linden 6ad09b875c PATH-773: correct update of grid and location selectors for arbitrary locations 2012-06-26 15:14:33 -04:00
Oz Linden 0f958faacd merge up to 3.3.3-release + pathfinding 2012-06-25 17:16:29 -04:00
Oz Linden 1b8bbc7b86 PATH-773: fix up how the location and grid selectors work on the login panel 2012-06-25 17:04:32 -04:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00
Oz Linden f64a79d9d1 merge changes for DRTVWR-171 2012-06-21 14:19:25 -04:00
Todd Stinson 37e6aa609f PATH-723: Pulling in whether the user has access to view the rebake navmesh button or not. 2012-06-19 20:09:35 -07:00
Oz Linden da0b5fe998 merge up to latest viewer-development-havokai 2012-06-19 13:50:10 -04:00
prep 15d7f3867c Don't display the rebake navmesh button while SL splash screen is up 2012-06-19 10:40:03 -04:00
prep 43c6d1a247 path-722: At startup we request the agent status update. 2012-06-15 13:00:37 -04:00
Oz Linden d500379cea PATH-735: Limit and clean up grid selection 2012-06-12 21:58:52 -04:00
Todd Stinson b912c27bf4 PATH-711: Implementing Leo's changes for the pathfinding console. 2012-06-11 16:40:53 -07:00
Brad Payne (Vir Linden) 5700ba737d avatar metrics - cleanup, removed unused fields 2012-06-11 11:00:38 -04:00
AlexanderP ProductEngine ec726c3a3e CHUI-119 WIP Fixed some bugs 2012-06-11 17:04:58 +03:00
Seth ProductEngine d11f542ffe CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P chat, after adding more participants.
- Added a parameter to LLAvatarActions::startConference() and LLIMMgr::addSession() to pass the uuid of a P2P IM floater which should be used to start a new conference in it.
- In LLChicletBar::sessionRemoved() we don't close the IM floater if it is going to be re-used for a new conference.
2012-06-07 00:59:05 +03:00
AlexanderP ProductEngine b7b6125001 CHUI-119 FIXED Bug fixed. Clean up a code 2012-06-01 14:57:51 +03:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Todd Stinson e76d7d73c5 Removing cruft code that is no longer used. 2012-05-23 18:58:47 -07:00
Oz Linden 95090c5d1e merge changes for version 3.3.1 2012-05-08 15:51:56 -04:00
Brad Payne (Vir Linden) 678864e4ed merge viewer-release to drano 2012-05-02 13:00:59 -04:00
Brad Payne (Vir Linden) 08704b36f6 startup phase tracking added to appearance metrics 2012-04-19 17:12:49 -04:00