24a867a646
Merged from ssh://hg.lindenlab.com/dessie/viewer-private
2010-05-28 17:19:20 +01:00
7983de2207
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-05-28 11:39:28 -04:00
e07deaa3da
AVP-44 WIP architectural cleanup for multi-wearables
...
Implemented some resident-suggested tweaks to better support multiwearables
code reviewed by Seraph
2010-05-28 11:38:37 -04:00
80d9cde596
Try using mbstowcs() to convert to std::wstring.
...
LLWString cannot be converted to std::wstring, apparently.
2010-05-28 16:15:00 +01:00
955698c7a6
automated merge
2010-05-28 10:41:17 -04:00
590a3d891c
On Windows, you have to pass the minidump path as a wstring.
2010-05-28 15:40:16 +01:00
4fb7738027
Write breakpad minidump files to the SL log directory.
...
Also, clean out old minidump files when we start up.
2010-05-28 15:10:52 +01:00
176b5c5a67
EXT-7138 FIXED Merge Voice Morphing from aimee/viewer-trunk_voice-features
2010-05-28 13:18:50 +01:00
7e0b36d610
CID-442
...
Checker: FORWARD_NULL
Function: LLBasicCertificateVector::insert(LLCertificateVector::iterator, LLPointer<LLCertificate>)
File: /indra/newview/llsechandler_basic.cpp
2010-05-28 12:47:45 +01:00
58fb834a6e
CID-443
...
Checker: FORWARD_NULL
Function: LLBasicCertificateVector::BasicIteratorImpl::equals(const LLPointer<LLCertificateVector::iterator_impl> &) const
File: /indra/newview/llsechandler_basic.h
2010-05-28 12:46:31 +01:00
6f8e96159a
CID-448
...
Checker: UNINIT_CTOR
Function: LLVoiceClient::LLVoiceClient()
File: /indra/newview/llvoiceclient.cpp
2010-05-28 12:41:54 +01:00
3927d18327
CID-466
...
Checker: NULL_RETURNS
Function: LLInventoryItemsList::refresh()
File: /indra/newview/llinventoryitemslist.cpp
2010-05-28 12:31:43 +01:00
4f0d410904
EXT-7496 FIXED Turn OFF extra Voice debug logging when merging Voice Morphing
2010-05-28 12:28:40 +01:00
878e1d06d5
CID-476
...
Checker: NULL_RETURNS
Function: LLPanelEditWearable::updateScrollingPanelUI()
File: /indra/newview/llpaneleditwearable.cpp
2010-05-28 12:20:06 +01:00
14e03b56fc
CID-480
...
Checker: UNINIT_CTOR
Function: LLVivoxVoiceClient::participantState::participantState(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/newview/llvoicevivox.cpp
2010-05-28 12:09:48 +01:00
b3f758785d
CID-479
...
Checker: UNINIT_CTOR
Function: LLVivoxVoiceClient::sessionState::sessionState()
File: /indra/newview/llvoicevivox.cpp
2010-05-28 12:07:45 +01:00
89990d746e
CID-477
...
Checker: NULL_RETURNS
Function: LLCOFWearables::buildClothingListItem(LLViewerInventoryItem *, bool, bool)
File: /indra/newview/llcofwearables.cpp
2010-05-28 12:06:03 +01:00
c68e4c5597
CID-478
...
Checker: NULL_RETURNS
Function: LLCOFWearables::buildBodypartListItem(LLViewerInventoryItem *)
File: /indra/newview/llcofwearables.cpp
2010-05-28 12:04:49 +01:00
e25d0d34ba
CID-481
...
Checker: FORWARD_NULL
Function: LLTaskInvFVBridge::createObjectBridge(LLPanelObjectInventory *, LLInventoryObject *)
File: /indra/newview/llpanelobjectinventory.cpp
2010-05-28 12:01:26 +01:00
20d223620e
remove dos line-endings, grr.
2010-05-28 11:18:02 +01:00
d2cc5dd0f5
merge
...
--HG--
branch : product-engine
2010-05-28 12:52:40 +03:00
959e4c40cc
EXT-7208 PARTIAL FIXED fixed tattoo texture pickers, repositioned tattoo color picker
...
- assigned callbacks for tattoo texture pickers
- repositioned tattoo color picker
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/453/
--HG--
branch : product-engine
2010-05-28 12:49:29 +03:00
ba59f71d5e
EXT-7341 FIXED updating My Outfits with wearables ordering information on the very first login
...
added saving ordering information for wearables of already populated My Outfits category on the very first login
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/455/
--HG--
branch : product-engine
2010-05-28 12:44:28 +03:00
a7ffd8b7a3
merge from PE's viewer-trunk
2010-05-28 09:56:21 +01:00
6b8fec008b
Fix build break
2010-05-28 01:03:17 -07:00
0ffba7c663
automated merge
2010-05-27 22:58:40 -07:00
d7144e76bf
automated merge
2010-05-27 21:48:20 -07:00
e44d0254af
automated merge
2010-05-27 21:22:46 -07:00
3729983908
WIP VPLAT-248 cleanups for google_breakpad symbol file generation.
2010-05-27 19:13:51 -07:00
d1c42b2bf3
Fix for linux build breakage.
2010-05-27 19:12:29 -07:00
8ec4f45daa
merge
2010-05-27 18:28:31 -07:00
68ca9dc957
VI-49 FIX "_external" links should work in shared media
...
monroe already did most of this, just moved dialog for confirming opening external browser to common code that calls out to external browser
so no way to skip notification unless the user opts out
2010-05-27 18:26:06 -07:00
64ba7744e6
mo' mergin mo problems
2010-05-27 18:23:24 -07:00
cf05f59dd9
EXT-7388 - --grid command-line argument does nothing
...
Fix up overriding of --loginuri --loginpage --helperuri
2010-05-27 17:20:29 -07:00
f6ee642edf
merge
2010-05-27 17:19:52 -07:00
776fea3764
Merge
2010-05-27 16:54:57 -07:00
a6a9e89393
EXT-3780 FIX Bug in linux reporting.
2010-05-27 16:22:47 -07:00
9cbd65d679
EXT-7504 WIP Force decloud after timeout using lower res textures
...
Changed lower res timeout setting to be persistent.
2010-05-27 19:08:25 -04:00
e89611291e
EXT-7504 WIP Force decloud after timeout using lower res textures
...
EXT-7526 FIXED Add baked texture information to texture view
First attempt at low res textures after timeout.
Added debug setting to control whether low res texture timeout is used.
Added baked texture load information to texture view debug display.
Trivial name changes to some variables.
2010-05-27 18:59:28 -04:00
d9052212b5
Merge of latest dessie/viewer-public with brad/viewer-public
2010-05-27 15:40:16 -07:00
495f62298c
explicit cast cr:Roxie
2010-05-27 15:36:45 -07:00
4e8d423cc5
WIP VPLAT-248 - Bugfix for last checkin (build depencencies for new generate_breakpad_symbols target were slightly off)
...
thanks for the code review mani!
2010-05-27 15:29:18 -07:00
2cfa661c27
WIP VPLAT-248 - added a generate_breakpad_symbols target to the build and info to upload symbol files to s3 after the build.
2010-05-27 14:49:15 -07:00
7d501b1164
WIP VPLAT-248 - New library package for google_breakpad on mac including dump_syms tool.
2010-05-27 14:30:15 -07:00
d7f065684d
EXT-7332 WIP remove DE override
2010-05-27 14:13:27 -07:00
5fb6f4fe93
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-05-27 14:10:19 -07:00
0c7fafb704
merge
2010-05-27 17:05:30 -04:00
d213946c6c
EXT-6953 WIP - pre-push cleanup after review. Accumulated EXT-6953 commits reviewed by Nyx.
2010-05-27 17:04:48 -04:00
a1b973fc2a
EXT-7118 FIXED Changed text in group call invite.
...
- Changed group invite string from "has joined a Voice Chat call with the group [GROUP]" to "just joined '[GROUP]' voice channel."
- Added special string for group invite question saying "Would you like to leave [CURRENT_CHAT] and join the call with '[GROUP]'"?
- Hooked up this string in code.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/458/
--HG--
branch : product-engine
2010-05-28 00:03:08 +03:00
250e57cc95
ifdef out windows includes
2010-05-27 14:02:58 -07:00
Aimee Linden