a04a706c1b
merge
2013-05-21 16:18:48 -04:00
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
327c99cadb
merge up to 3.5.2 development
2013-04-16 16:01:32 -04:00
ce0dbbd8a5
Add reporting of last_exec_duration
...
(and clean up logic around multiple instances)
2013-04-02 12:57:09 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
cfd35b8b22
Made a bug that was masking the warning about mismatched caps coming from a region. They could never match because certain capabilities are explicitly not stored when we receive them.
...
* Made mSecondCapabilitiesTracker set capabilities in a way that more closely matches mCapabilities so that they will match up when we get a second cap grant from a region if the caps that were sent are actually the same.
* Added more logging around setting a region's seed capability.
* Also added a static function in llviewerregion to dump out a CapabilityMap based on the logActiveCapabilities method. Defined the old method in terms of the new static free function.
2013-03-28 18:07:54 -04:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
9a0c52a247
Adding debug setting to allow overriding appearance service url
2013-03-05 11:28:06 -08:00
70e22de2bb
SH-3860 WIP - fixes the cloud on initial login, still have a COF version rae condition due to creation of the base outfit link
2013-03-01 09:06:40 -05:00
cd0b089bb0
merge
2013-02-28 13:56:52 -05:00
2b6d7e5005
SH-3860 WIP - fixes for initial COF loading and config
2013-02-27 17:58:43 -05:00
b16dcda6a3
SH-3860 WIP, SH-3899 WIP - make folder version management more debuggable, log appearance request results
2013-02-25 19:12:36 -05:00
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
b0f2f02333
Removed (most) references to older FMOD library - still a little Linux clean up left
2013-02-01 08:44:52 -08:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
ba3e89b5c7
first push - patch from CmdCupCake plus force FMODEX on
2013-01-18 16:43:19 -08:00
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
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08:00
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
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
67bc42a80a
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-20 16:20:40 -08:00
c9044c03b3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-09 18:51:23 -08:00
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
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
d3924200b6
Removing unused gHeadlessClient code from viewer
2012-09-23 03:06:11 +00:00
77b33d9623
SH-3264 Porting over the XML loading of the avatar structure to llappearance
...
Moved over the necessary classes to llappearance to support the loading of the
avatar's structure & params from file.
2012-09-07 23:17:34 -04:00
55a812ca77
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-06 16:37:51 -05:00
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
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
93578f7e51
Automated merge with http://bitbucket.org/lindenlab/viewer-cat
2012-08-24 16:31:29 -07:00
14708a3ace
CHUI_310 make NearbyChat a singletone
2012-08-22 18:27:29 +03:00
6d84272d38
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-08-23 15:11:10 -07:00
7ac0d2b8a3
Merge viewer-development -> sunshine
2012-08-17 01:41:07 +00:00
97106c2dea
merge changes for DRTVWR-194
2012-08-15 17:07:10 -04:00
981190cf31
merge back beta fixes
2012-08-14 18:41:25 -04:00
5f1230e911
MAINT-1342: correct initial login location handling, clarify the two related persistent settings
2012-08-09 11:52:48 -07:00
9488baada3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-08-09 12:06:09 -07:00
f1ff284569
Automated merge with http://hg.secondlife.com/viewer-development
2012-08-02 13:23:46 -04:00
6ae4802e6d
merge
2012-07-30 19:10:46 -04:00
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
a5c9d89b28
merge
2012-07-30 14:57:33 -04:00
c1aa0cc4fc
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
2012-07-27 15:38:03 -07:00
3e038cd71b
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-27 12:53:54 -07:00
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
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
Brad Payne (Vir Linden)