98d776ba76
Backed out changeset: 5ccc4164be52 (to get ready to picl up LL's texture browser)
2012-05-28 13:55:56 -07:00
f9c0bac97e
Linux build fix.
...
Moved type casts from protected base classes to derived LLCoord.
2012-02-23 21:02:46 +02:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
34d223148f
Fix for FIRE-6119 (Spinners broken after preprocessor merge). Please test for linux/mac breakage on preproc, chatbar_as_cmdline's calc command and math in spinners.
2012-04-23 18:53:21 -07:00
be8136be19
Fix crash in LLCalc::evalString, see FIRE-4381.
2012-03-29 19:39:07 +02:00
bbdb390624
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
2012-02-08 19:55:28 -08:00
f27ea1aff7
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
...
fixed build
moved conversion funcs to llwindow.cpp as they work on all platforms
refactored translateintorect to take overlap as parameter
2012-02-07 22:50:49 -08:00
4e08461f8a
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
...
changed over to new convert() method
added LLCoordFloater
2012-02-07 19:29:10 -08:00
d56be1f175
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
...
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
2ed1de224a
Automated merge with http://hg.secondlife.com/viewer-development
2012-02-06 15:28:45 -08:00
d32c1c28b4
cleaned up linden_common.h, removing stuff that is mostly unused
2012-02-01 16:39:27 -08:00
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
18e7f1bffd
SH-2889 Add visual auto-muting controls
2012-01-20 16:42:57 -06:00
c0b4ec6fe7
SH-2694 Fix for FPS drop when mousing over flexi objects (don't use an octree for flexi raycast)
2011-12-16 17:43:30 -06:00
76bd8cee11
SH-2644 Fix debug display that shows selection triangle count and streaming cost
2011-11-10 14:48:48 -06:00
db7924681d
SH-24114 Remove unused vectorization code (outdated/unused with SSE2 requirement and llvetor4a et al)
2011-11-08 17:46:43 -06:00
f3c0bbf162
Automated merge with http://hg.secondlife.com/viewer-development
2011-10-26 11:53:01 -07:00
17194cab5d
Removed text spam about range of spatial partition, per davep.
2011-10-26 09:55:57 -07:00
c0ca8e5e2e
Merge backout of b782a75c99e6
2011-10-14 11:58:35 -05:00
4331c112ab
Backed out changeset b782a75c99e6
2011-10-14 11:52:40 -05:00
4b269f67ea
merge
2011-09-14 14:54:20 -04:00
b2853c1a74
merge
2011-09-13 12:11:11 -04:00
1c7b1532e9
Merge from viewer-experience
2011-09-08 10:55:48 -07:00
08c0de785f
merge
2011-09-06 09:42:11 -04:00
fc45e9cbf6
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-02 20:24:06 -07:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
8cef480b96
fix for SH-2311: crash at LLVOVolume::lineSegmentIntersect line 3435
...
and SH-2358: Crash in LLError::crashAndLoop: Invalid face index
2011-08-29 18:15:38 -06:00
7b03eb0083
Fix LLVector4a::memcpyNonAliased16 so it does not overwrite memory past the end of destination buffer anymore.
2012-02-13 00:33:07 +01:00
ce608c6839
Optimize calculation of estimated triangles / LOG. Reuse old value if input parameters did not change.
2012-02-05 15:07:48 +01:00
9f7c9cffa3
Merge up to 26380 / 19ccfae26929 (V/dev tip).
2012-02-02 19:38:24 +01:00
1714747536
After merge compare FS tree agsindt V/dev.
...
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
8961d10a2a
Merge from viewer-experience
2011-08-23 13:11:14 -07:00
56453f2982
EXP-1129 FIX SLURLs with only 2 coordinates are interpreted as center of sim
...
reviewed by Leslie
2011-08-22 13:16:58 -07:00
4b2ba7236f
Merge from viewer-experience
2011-08-22 11:41:18 -07:00
9ed7cc297a
merging in latest mesh-development
2011-08-19 17:03:51 -04:00
af8864c49c
merge
2011-08-19 09:41:50 -04:00
cb09994ae2
merging in latest mesh-development
2011-08-18 19:17:34 -04:00
7e5be23686
add proper license headers to files that did not have them
2011-08-17 14:43:39 -04:00
f7d17cad5c
SH-2188 Fix for generally bad vertex buffer updates for rigged attachments and fix for viewer always thinking meshes initially have 8 texture entries.
2011-08-17 12:55:32 -05:00
1f97cca856
merging latest mesh-development.
2011-08-16 17:52:25 -04:00
5c0df02df5
SH-2147 Clarify and quiet log spam on mesh LoD unzip failure.
2011-08-15 12:18:06 -05:00
402a2de765
merging latest viewer-mesh into nyx's sidebranch
2011-08-15 11:41:00 -04:00
10ec004912
merge from viewer-experience
2011-08-12 14:53:25 -07:00
60d15f78e1
merge with latest mesh-dev
2011-07-26 15:51:44 -04:00
7ef1550fbb
merge
2011-07-18 23:50:50 -05:00
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
dd3069127b
merge
2011-07-13 14:57:23 -04:00
44c7c6feaa
merge changes for storm-1315
2011-07-11 16:52:00 -04:00
8529c37dee
merge changes for storm-1488
2011-07-11 06:16:19 -04:00
Tank_Master