c952913ff3
Replace changes of LLInventoryModel::item_array_t being a vector now.
2014-06-10 19:42:37 +02:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
e9b2f0092d
Don't detach LSL bridge when taking off all avatar attachments
2014-04-05 22:12:56 +02:00
26aa6ad7cc
Refactor LSL bridge to better work with OpenSim, provided by Cinder Roxley:
...
* Don't flip UseLSLBridge setting when in OpenSim
* Check for bridge existence before using it
* Cut off the bridge creation process on OpenSim
* Some other refactoring
2014-04-05 22:02:32 +02:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
8eb56668fe
SUN-69 MAINT-2258 : temp attachments getting removed improperly. Reviewed by Kelly.
2013-10-17 14:58:27 -07:00
958292740c
Merged with RLVa tip
2014-02-26 22:44:49 +01:00
ae58884823
- fixed : attachments can no longer be detached on release builds
...
--HG--
branch : RLVa
2014-01-29 16:53:55 +01:00
ce3ff8d279
- internal : added supporting code for "Detach Folder" RLVa lock checks
...
--HG--
branch : RLVa
2014-01-26 20:00:57 +01:00
341aaa826d
Merged with default tip (Revision a1402f717095)
...
--HG--
branch : RLVa
2013-12-11 10:56:23 +01:00
316510aa60
Merged with default tip (Revision a1402f717095)
...
--HG--
branch : Appearance-Misc
2013-12-09 15:07:58 +01:00
07acc3112c
Fix formatting and add comment for previous commit
2014-01-26 13:57:27 +01:00
9894cf37d3
Fixed: BUG-4413
2014-01-18 17:28:34 +01:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
037414f4fc
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : Appearance-Misc
2013-07-20 20:55:07 +02:00
10a289598b
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : RLVa
2013-07-21 22:33:04 +02:00
d73dfe16c4
Merged with .RLVa tip
...
--HG--
branch : RLVa
2013-07-21 19:01:58 +02:00
0ea462a7cb
- internal : removed Appearance-MixedViewers patch branch
...
--HG--
branch : .RLVa
2013-07-21 18:56:35 +02:00
a9ffc0120a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : RLVa
2013-05-06 23:54:58 +02:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
9177903931
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-04-29 15:39:42 +02:00
feccd2ba6a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : Appearance-MixedViewers
2013-04-29 15:33:37 +02:00
78d8247bf8
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : Appearance-Misc
2013-04-29 15:33:12 +02:00
10a116bfc4
- fixed : temporary attachments can not be detached when RLVa is enabled
...
-> hack-ish solution where we always allow detach of anything without an inventory item
--HG--
branch : RLVa
2013-04-15 22:01:11 +02:00
d1d0a2cf67
SH-4058 - log spam reduction initiative.
2013-04-03 14:58:33 -04:00
de2c88ca43
Moved LastUpdateCOF stuff to avatar, so we can track last received for non-self avs
2013-03-22 12:17:06 -04:00
752951003b
Merged with viewer-sunshine tip (Revision 61124f8f8473)
...
--HG--
branch : RLVa
2013-03-19 22:45:32 +01:00
3359a90b4a
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-03-19 22:43:07 +01:00
c1f7d26b51
Merged with default tip (Revision 61124f8f8473)
...
--HG--
branch : Appearance-Misc
2013-03-19 22:27:08 +01:00
a8be72f19f
Merged with default tip (Revision 61124f8f8473)
...
--HG--
branch : Appearance-MixedViewers
2013-03-19 22:26:45 +01:00
6f193d54da
SH-3806 FIX test case for local bakes being wrong
...
Local bakes were following folder links in some cases, causing unworn items to be rendered.
Fixed the cof fetcher, now they should no longer show up.
2013-03-13 17:52:40 -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
54cdc322b8
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-03-05 22:05:22 -08:00
be7c5c2cb9
Merged with viewer-sunshine tip (Revision 230637f9ff30)
...
--HG--
branch : RLVa
2013-03-05 23:22:31 +01:00
9a0c52a247
Adding debug setting to allow overriding appearance service url
2013-03-05 11:28:06 -08:00
2efe411a4f
Reducing amount of cof link data sent to appearance update service. Allowing links to items with 'null' asset ids to be passed
2013-03-04 12:02:02 -08:00
ec1bc19d01
Adding md5sum calculation to experimental server appearance update message
2013-03-04 01:09:45 -08:00
8410887e2e
Adding DebugAvatarExperimentalServerAppearanceUpdate setting to test sending full cof contents
2013-03-03 23:32:48 -08:00
d74b2985a5
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-03-03 13:13:22 +01:00
9b68e20e8d
Merged with viewer-sunshine tip (Revision 230637f9ff30)
...
--HG--
branch : Appearance-Misc
2013-03-02 17:12:17 +01:00
d736a528ac
Merged with viewer-sunshine tip (Revision 230637f9ff30)
...
--HG--
branch : Appearance-MixedViewers
2013-03-02 17:10:04 +01: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
ecb3d1d64d
SH-3932 FIX - added LLSD blob for viewer-side cof contents, optionally included with request appearance update
2013-02-28 15:58:56 -05:00
Nicky