5f64084313
Merge.
2010-06-14 14:33:46 -07:00
dc446700e3
FIX EXT-7857 - c-ares library initialization was skipping a new step.
2010-06-14 14:30:34 -07:00
fbc95fe7e7
EXT-7855 FIXED Memory leak in llmessage/llhttpclient.cpp
...
We now free the fileBuffer when we're done in VFileInjector::process_impl()
2010-06-14 17:29:22 +01:00
788c787ea7
Upgraded windows libcurl to 7.20.1 and c-ares to 1.7.1 for consistency with mac/linux and potentially improve EXT-7032 behavior.
2010-06-11 18:56:18 -07:00
ea5d8a1634
merge backout
2010-06-07 17:31:59 +01:00
3057651b1a
EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.
...
Backed out changeset e6feef9704cf to re-introduce Bao's fix
2010-06-07 17:31:22 +01:00
670e316dd7
Static VFS cache tracing
2010-05-24 18:05:15 -04:00
87d0c6d583
Backed out changeset 57e00f7d4d4f
...
(was: EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.)
This was causing osx/linux build failure.
2010-05-24 07:49:26 +01:00
9dada6bcc4
EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.
2010-05-18 14:14:50 -06:00
2fd59393fc
Automated Merge
2010-05-10 15:25:49 -07:00
9d23a40c85
DEV-49633 WIP LLHTTPClient calls responders with headers _before_ body
2010-05-04 11:42:17 -07:00
270d133882
Automated merge
2010-04-21 11:43:43 -07:00
42cbea759c
CID-462
...
Checker: DEADCODE
Function: LLAssetStorage::findInStaticVFSAndInvokeCallback(const LLUUID &, LLAssetType::EType, void (*)(LLVFS *, const LLUUID &, LLAssetType::EType, void *, int, int), void *)
File: /indra/llmessage/llassetstorage.cpp
2010-04-20 18:16:57 +01:00
aa5e494e0c
For EXT-6809 - fixes suggested by Nyx code review
2010-04-19 13:52:59 -04:00
c5e338f240
merge
2010-04-19 10:13:49 -04:00
695e4bc171
For EXT-6809 - search static VFS for all asset types
2010-04-19 10:00:06 -04:00
3b8ce1d18a
For EXT-6809 - search static VFS for all asset types
2010-04-16 17:13:11 -04:00
142f867d38
For EXT-6809 - search static VFS for all asset types
2010-04-16 16:06:34 -04:00
8d8f167a4e
automated merge with trunk
2010-04-19 16:24:05 -07:00
e2d32b9e9d
Fixed bug EXT-5415 (Edit floater and object profile show group as "loading..." when set to "none").
...
Made LLCacheName getGroupName() and getName() methods return TRUE if the given group/avatar name is NULL, so that LLNameBox doesn't display "Loading..." indefinitely.
There's nothing to wait for in case of NULL id: the name cache returns a predefined name that won't change (i.e. it's the final result).
Reviewed by Mike: https://codereview.productengine.com/secondlife/r/223/
--HG--
branch : product-engine
2010-04-13 16:29:33 +03:00
8ba5517a08
Automated merge
2010-04-07 13:20:33 -07:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
8da371b0f0
merge
2010-04-07 12:16:36 +01:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
2eba9819df
EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
...
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h
Change made to simulator files as well.
2010-04-05 15:02:36 -04: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
e504f89513
merge
2010-03-31 16:11:21 -04:00
2208e6da2c
asset request logging for DEV-47362 investigation.
2010-03-31 16:09:34 -04:00
d4fef262bc
EXT-5581 : Centralize is_asset_fetch/knowlable into asset dictionary
...
Took out some ugly case statements and stuck those functions into the asset dictionary instead. This makes the code a lot more centralized/extensible since if we ever add assets, it'll be clear that their fetch/knowable fields need to be added (versus that logic being in some obscure case statement).
2010-03-31 12:05:51 -04:00
86dc5bce1a
Automated merge
2010-03-29 16:24:58 -07:00
b1b5a11bb0
EXT-3075 : Remove swear words from comments across viewer
...
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2010-03-29 15:33:48 -04:00
18b7ab0018
Weekly automated merge from viewer 2.0
2010-03-22 16:12:41 -07:00
61d2caee9f
Fixed bug EXT-6446 (Profile Real World description gets messed up if out of the old characters' number limit).
...
Submitting on behalf of Dmitry Zaporozhan.
Reviewed by me and Richard: https://codereview.productengine.com/secondlife/r/67/
--HG--
branch : product-engine
2010-03-22 21:47:56 +02:00
2f9cc80c2e
fixed EXT-5910 “Offers logging”,
...
fixed IM message counter when received interactive notification(offer);
corrected logging to file of offer notification;
enabled logging for FRIENDSHIP_ACCEPTED notification;
--HG--
branch : product-engine
2010-03-05 17:53:32 +02:00
0b450b6003
Changing viewer unit test licenses to viewergpl
2010-02-12 16:32:28 -08:00
08b93d95ef
CID-277
...
Checker: UNINIT_CTOR
Function: LLPacketBuffer::LLPacketBuffer(const LLHost &, const char *, int)
File: /indra/llmessage/llpacketbuffer.cpp
a fix I like better.
2010-02-03 20:26:42 +00:00
2879692aa2
CID-277
...
Checker: UNINIT_CTOR
Function: LLPacketBuffer::LLPacketBuffer(const LLHost &, const char *, int)
File: /indra/llmessage/llpacketbuffer.cpp
2010-02-03 20:25:04 +00:00
eab2f01b19
CID-278
...
Checker: UNINIT_CTOR
Function: LLTransferTargetParamsFile::LLTransferTargetParamsFile()
File: /indra/llmessage/lltransfertargetfile.h
2010-02-03 20:18:22 +00:00
4e73292e2c
CID-279
...
Checker: UNINIT_CTOR
Function: LLTransferTarget::LLTransferTarget(e_transfer_target_type, const LLUUID &, e_transfer_source_type)
File: /indra/llmessage/lltransfermanager.cpp
2010-02-03 20:14:57 +00:00
428eb8555e
CID-280
...
Checker: UNINIT_CTOR
Function: LLTransferTargetParamsVFile::LLTransferTargetParamsVFile()
File: /indra/llmessage/lltransfertargetvfile.cpp
dead field.
2010-02-03 20:12:31 +00:00
f117db5798
CID-281
...
Checker: UNINIT_CTOR
Function: LLTransferSourceParamsAsset::LLTransferSourceParamsAsset()
File: /indra/llmessage/lltransfersourceasset.cpp
2010-02-03 20:03:17 +00:00
e5e654ac5a
CID-298
...
Checker: UNINIT_CTOR
Function: LLMsgData::LLMsgData(const char *)
File: /indra/llmessage/llmessagetemplate.h
2010-01-29 15:57:33 -08:00
a09b94eff7
CID-305
...
Checker: UNINIT_CTOR
Function: LLSrvRecord::LLSrvRecord(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&, unsigned int)
File: /indra/llmessage/llares.cpp
2010-01-29 15:37:28 -08:00
1ce9515685
CID-306
...
Checker: UNINIT_CTOR
Function: LLAddrRecord::LLAddrRecord(LLResType, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&, unsigned int)
File: /indra/llmessage/llares.cpp
2010-01-29 15:35:36 -08:00
749eade1cb
CID-307
...
Checker: UNINIT_CTOR
Function: LLQueryResponder::LLQueryResponder()
File: /indra/llmessage/llares.cpp
2010-01-29 15:34:06 -08:00
641f292a5a
CID-308
...
Checker: UNINIT_CTOR
Function: LLPartSysCompressedPacket::LLPartSysCompressedPacket()
File: /indra/llmessage/partsyspacket.cpp
2010-01-29 15:31:56 -08:00
f4c0a5b042
partial appeasement for CID-309
...
only this piece really matters. a bit.
Checker: UNINIT_CTOR
Function: LLMessageSystem::LLMessageSystem(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&, unsigned int, int, int, int, bool, float, float)
File: /indra/llmessage/message.cpp
2010-01-29 15:30:41 -08:00
ce8e2fc322
CID-310
...
Checker: UNINIT_CTOR
Function: LLSimpleResponse::LLSimpleResponse()
File: /indra/llmessage/llhttpnode.h
2010-01-29 15:19:56 -08:00
bdbb42c0f6
CID-311
...
Checker: UNINIT_CTOR
Function: LLXfer::LLXfer(int)
File: /indra/llmessage/llxfer.cpp
2010-01-29 15:16:59 -08:00
brad kittenbrink