Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Lynx Linden bd4c1fa8d8 DEV-40702: Internationalize the unknown Vivox version string rather
than hardcode it in llvoiceclient.cpp. Also rename the string from
"Unknown" to "Not connected", to better reflect the fact that we get
the Vivox version once voice is connected.
2009-12-01 10:52:04 +00:00
Alexei Arabadji d3ae1d909e fixed EXT-2958 “The states of checkboxes from Notes&Privacy tab are not saved
after having been modified”;

--HG--
branch : product-engine
2009-12-01 12:24:46 +02:00
angela c4d6442ef4 EXT-2927 [BSI] profile text and partner text overwrite after selecting I button on a user 2009-12-01 18:02:24 +08:00
angela a8796e17bb EXT-2854 Replace instances in the viewer with the final search maturity names 2009-12-01 16:21:08 +08:00
callum e0a7b7608f Add support for dropping a region SLURL on login page and populating the UI 2009-11-30 20:19:39 -08:00
Steve Bennetts c760220b00 Merge from product-engine 2009-11-30 19:15:29 -08:00
Samuel Kolb 4b710367a1 local merge 2009-11-30 18:06:23 -08:00
callum 6dd3f54924 Simple fix for Hg merge tool shittiness.. 2009-11-30 17:55:19 -08:00
James Cook 78626b7f6c merge 2009-11-30 17:36:48 -08:00
James Cook c81e5f22c0 Clean up test XML 2009-11-30 17:36:37 -08:00
James Cook 93ab50efd2 Bump Parabuild 2009-11-30 17:36:10 -08:00
callum 532a8ed056 Merge with tip 2009-11-30 17:14:37 -08:00
callum d90aea0ede Fix for DEV-41951 - reworking of whitelist so it's more usable. 2009-11-30 17:13:41 -08:00
Lis Pardi 588d3e0dad arrow_up and arrow_down were removed from textures at some point. I put them back so that the arrows in panel_preferences_alerts look right. 2009-11-30 19:31:46 -05:00
Rick Pasetto 948af3093c Automated merge with ssh://rick@hg.lindenlab.com/skolb/media 2009-11-30 16:04:25 -08:00
Rick Pasetto b6f3692c28 Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/ 2009-11-30 16:03:38 -08:00
Lis Pardi c1889193c0 ext-2880 'My Balance" btn overlaps the 'Time' indicator 2009-11-30 19:02:37 -05:00
Rick Pasetto b9de2b2572 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-30 16:01:34 -08:00
Rick Pasetto 5040a72675 DEV-43041 DEV-41648 - disable OK and Apply if the media data is the same as the initial
Review #48

This change kills two birds with one stone: every frame, we check to see if the media data is the same as the one we 'initialize' with. If it is, we disable OK and Cancel. Otherwise we enable them. This makes it very difficult to set empty media data, as well as fixing the "apply button doesn't grey out" bug.
2009-11-30 16:01:20 -08:00
Nyx (Neal Orman) 28feae36ee EXT-2769 EXT-2770 alpha masks not working properly
Eyes weren't alpha masked.
Hair wasn't being consistently alpha masked
Hair alpha mask was being ignored during avatar customization
We weren't hitting onFirstTEMessageReceived()

All of these were fixed. Also takes care of EXT-2926 EXT-2925 EXT-2974

Code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-11-30 18:52:21 -05:00
James Cook 6feb42e009 De-inlined some UI param block definitions. 2009-11-30 15:45:15 -08:00
Rick Pasetto ee314f6df6 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-30 15:26:26 -08:00
Justin C. Rounds (Chuck) 053c93f9f4 Removed font setting to un-bold accordion headers.
http://jira.secondlife.com/browse/EXT-2970
2009-11-30 18:12:02 -05:00
Justin C. Rounds (Chuck) 6272557773 Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/ 2009-11-30 18:07:15 -05:00
Justin C. Rounds (Chuck) 68c53963b3 Changed highlight color text for filtered items.
http://jira.secondlife.com/browse/EXT-2812
2009-11-30 18:06:18 -05:00
bea@american.lindenlab.com 8e3276ebf9 doxygen: exclude licensing comments 2009-11-30 14:53:31 -08:00
bea@american.lindenlab.com 199d42f274 doxygen: exclude licensing blurbs 2009-11-30 14:46:35 -08:00
James Cook d83f934ec8 merge 2009-11-30 14:42:34 -08:00
James Cook 7d3b3cc474 Linker optimization - use "extern template" for commonly regenerated templates
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
Loren Shih 1f1afc253d INFRASTRUCTURE: LLToolDragAndDrop cleanup
Includes removal of unused header files.
Includes changing big static map into a lldictionary.

--HG--
branch : avatar-pipeline
2009-11-30 17:17:59 -05:00
Justin C. Rounds (Chuck) 1ec8ca3788 Updated layout.
http://jira.secondlife.com/browse/EXT-2733
http://jira.secondlife.com/browse/EXT-2953
2009-11-30 17:08:31 -05:00
Nyx (Neal Orman) 4c90bcd574 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-30 15:22:12 -05:00
Nyx (Neal Orman) 4671258569 EXT-2974 alpha mask changes are not applied immediately
Changed local compositing code for alpha masks to handle the case where
we are generating a local composite of an alpha masked body part.
See JIRA for repro information

Code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-11-30 15:22:03 -05:00
Alexei Arabadji 7c0eac93e7 mplemented EXT-2891 “Group notices should be recorded into group IM history”;
--HG--
branch : product-engine
2009-11-30 21:41:17 +02:00
Nat Goodspeed c5b5e56f74 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-30 11:30:10 -08:00
Nat Goodspeed 7681212d87 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-30 14:19:40 -05:00
Lynx Linden 6223485bfa Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-30 18:44:12 +00:00
Lynx Linden dcc617fcf5 Made the gcc version number checking more robust in llaudio's
CMakeFiles.txt file. Previously it checked for a narrow range of gcc
versions via a regex:

      if (${CXX_VERSION} MATCHES "4.[23]")

Now we explicit check for any version >= 4.2:

      if (${CXX_VERSION_NUMBER} GREATER 419)
2009-11-30 18:42:45 +00:00
Alexei Arabadji 5ed4c70156 implemented EXT-2962 “Implement adding messages into IM history w/o spawning
chiclet”

--HG--
branch : product-engine
2009-11-30 19:59:44 +02:00
Nat Goodspeed 7b6ddb4106 DEV-43463: Keep LLEventPump's LLStandardSignal alive during post()
Replace LLEventPump's boost::scoped_ptr<LLStandardSignal> with
boost::shared_ptr. Take a local stack copy of that shared_ptr in post()
methods, and invoke the signal through that copy. This guards against scenario
in which LLEventPump gets destroyed during signal invocation. (See Jira for
details.) Re-enable Mani's test case that used to crash.
Introduce ll_template_cast<> to allow a template function to recognize a
parameter of a particular type.
Introduce LLListenerWrapper mechanism to support wrapper objects for
LLEventPump listeners. You instantiate an LLListenerWrapper subclass object
inline in the listen() call (typically with llwrap<>), passing it the real
listener, trusting it to forward the eventual call.
Introduce prototypical LLCoutListener and LLLogListener subclasses for
illustrative and diagnostic purposes. Test that LLLogListener doesn't block
recognizing LLEventTrackable base class bound into wrapped listener.
2009-11-30 12:57:45 -05:00
Tofu Linden c2fbdab7f1 lots more clean-up. 2009-11-30 17:30:45 +00:00
Rick Pasetto aae1917d2e merge 2009-11-30 09:25:39 -08:00
Rick Pasetto 8671bfb930 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-30 09:15:34 -08:00
Tofu Linden b9a6776a73 remove dead panel version of the master volume pulldown.
the floater version turned out easier to get on-spec (though not perfect).
2009-11-30 17:14:29 +00:00
Samuel Kolb e2699c64a2 merge viewer-2-0 into media 2009-11-30 09:11:04 -08:00
Alexei Arabadji 1a62224309 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2009-11-30 19:08:42 +02:00
Loren Shih 7e2b88a32b EXT-2867 : Crash after toggling gestures on and off
Observer wasn't being removed when class was deleted.

--HG--
branch : avatar-pipeline
2009-11-30 12:07:52 -05:00
Sergey Borushevsky 3854305519 Fixed build after implementation of EXT-2882.
Replaced LLNotifications::add call by LLNotificationsUtil::add.

--HG--
branch : product-engine
2009-11-30 18:58:52 +02:00
Brad Payne (Vir Linden) 4899fea006 For EXT-2857: Open 'Outfits Bar' accordion when creating/renaming new outfit
--HG--
branch : avatar-pipeline
2009-11-30 11:58:28 -05:00
Mike Antipov ca8a4f1f07 Fixed Line endings to Unix format
--HG--
branch : product-engine
2009-11-30 18:45:45 +02:00