1b4f90385d
Initialize variables (GCC warning).
2011-11-01 18:49:56 +01:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
af8864c49c
merge
2011-08-19 09:41:50 -04:00
0325d9060e
merge
2011-08-18 17:25:48 -04:00
f0bc8a0f71
convert tabs to spaces where they are forbidden
2011-08-17 12:33:23 -04:00
11005a9d91
added fast timers to profile inventory LLSD deserialization
2011-08-10 10:52:56 -07:00
b9247373fb
Sh-2129 Viewer caps implementation for resource cost selected. Also cleanup of old code related to earlier accounting work.
2011-08-02 17:01:46 -04:00
918238dd18
ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel
...
Privacy" changes. Many naming changes for the featureto be "See avatars"
instead of "hidden avatars". Also removed the "anyone can edit terrain"
checkbox and slammed the value to FALSE.
2011-07-01 14:06:08 -07:00
c0c0a2b9a5
ER-944: Add feature to control user sounds on a parcel. Added new checkboxes
...
to the About Land / Sound tab. Reviewed by Kelly.
2011-06-20 09:28:10 -07:00
5039378869
ER-910: Parcel Privacy. Rename things in code to reflect feature name change to "hidden avatars"
2011-06-09 13:46:19 -07:00
484a4733b7
Merge latest from lindenlab/viewer-development/
2011-06-08 14:53:00 -07:00
8e44963c19
Inventory cache optimization, by Nicky Dasmijn
2011-10-15 13:28:01 -04:00
3dfb4944ed
Merge latest from lindenlab/viewer-development
2011-05-24 10:51:09 -07:00
1a5b3b0a90
ER-914: Disable Parcel Privacy UI in viewer if on older sim
2011-05-24 10:44:27 -07:00
0b612741d5
SH-1252 and SH-1253 WIP.
2011-05-20 14:26:05 -04:00
ff3289e2f3
ER-898: Modify llGetParcelDetails() on viewer to support parcel privacy. Reviewed by Kelly.
2011-05-13 13:56:49 -07:00
9bfae21706
ER-858: Add viewer checkbox to toggle parcel privacy settings. Reviewed by Kelly
2011-05-02 16:35:55 -07:00
1ec800fb44
STORM-1037 : pull into viewer-development
2011-03-07 14:28:58 -08:00
c8293e29ca
Automated merge up from viewer-development into mesh-development
2011-03-09 11:24:54 -05:00
7bdf37f00c
storm-1037: remove the "hide url" checkboxes in parcel management
2011-03-03 14:22:37 -05:00
24c908483c
STORM-969 / ER-493 - Viewer side of the work to add 'Rentals' as a land type to the parcel API
2011-02-07 20:03:45 -05:00
aba13fb96c
Automated merge up from viewer-development
2010-12-21 17:26:13 -05:00
91021bf905
VWR-24263: Crash fix for notecards with negative text length
2010-12-14 12:30:32 -08:00
963e3346b1
Automated merge up from viewer-development
2010-12-03 10:41:46 -05:00
732b1f748e
Forgot to give myself credit.
2010-11-25 13:45:05 -05:00
193fddd02a
Fix link error: unsigned char const TASK_INVENTORY_ASSET_KEY
2010-11-25 06:11:43 -05:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
295de1a537
Put some errant tests under if (LL_TESTS) conditional.
2010-09-30 15:56:41 -05:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
35c81f75ac
Fix for bad zipping of meshes and add mesh icon back to repository.
2010-09-24 23:52:32 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
e68f9e566b
merge
2010-08-31 16:37:40 -05:00
d04e8d7575
merging up from viewer-development
2010-08-30 11:56:33 -07:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
48743cbd41
standardizing test suite names as class name under test
2010-08-24 23:41:47 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
855192a83b
VWR-20768 (SNOW-507) FIXED Missing LL_TEST conditions in cmake files
2010-08-18 17:41:36 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
2e9af02b57
Bury the dead code day: Cleanup redundant XUI files
2010-07-19 14:55:58 +01:00
5c9fc08604
Bury the dead code day: Cleanup redundant XUI files
2010-07-19 14:55:58 +01:00
2dd3a6be72
Fix for mesh upload, consolidate generating bad indices, and normal generation.
2010-07-13 12:02:14 -05:00
c897061856
Merge with q/viewer-release
2010-06-21 10:21:52 -07:00
1b7b8aa00e
merge
2010-06-14 23:14:14 -05:00
6e37ec08f6
Builds with LLConvexDecompInter as a static lib.
2010-06-14 23:13:10 -05:00
37a8c12bd3
merge
2010-06-14 23:04:11 -05:00
Nicky