Nyx (Neal Orman)
2ee9d84f6d
SH-395 FIX linux opensource mesh viewer is broken on teamcity
...
Fixed the pcre autobuild scripts to include the resulting library files
and put them in the correct place. I think this should fix the build.
2010-10-29 12:11:41 -04:00
Nyx (Neal Orman)
2bd690dffb
Automated merge with https://hg.secondlife.com/mesh-development
2010-10-28 20:51:03 -04:00
Nyx (Neal Orman)
2115e63a85
SH-395 SH-396 WIP fix mac and linux builds for opensource mesh branch
...
MAC: naming problem on collada library files (.dylib). updated install.xml
to refer to the fixed package
LINUX: PCRE was too out of date for our collada implementation. Created a new
PCRE package and updated install.xml to match it.
2010-10-28 20:50:47 -04:00
Dave Parks
cae0544519
merge
2010-10-28 17:43:39 -05:00
Dave Parks
94c2e4c0ae
Fix for NAN getting copied for some color values (NAN is purple).
2010-10-28 17:40:28 -05:00
Dave Parks
3084bd5209
Only force an update if a flexible object is visible.
2010-10-28 17:40:01 -05:00
Dave Parks
798ba26952
More aggressive management of FBOs. Allocate as few FBOs as possible, assert when FBOs are destroyed out of order.
2010-10-28 17:39:45 -05:00
JonathanLinden
dda21d67e5
Fix for CTS-305 'Uploaded meshes have uniform scale'
2010-10-28 14:32:00 -07:00
Christian Goetze (CG)
9c1d9665f7
Append logs of multivariant builds correctly.
2010-10-28 12:46:16 -07:00
Nyx (Neal Orman)
0207e04f0d
SH-395 WIP fixing linux build in opensource mesh branch
...
Reverting a previous cmake fix as we're not set up to use debug
libraries on non-windows platforms. Also removing references to
debug versions of tcmalloc to unstick the build.
2010-10-28 15:15:04 -04:00
prep
a91bff4036
merge
2010-10-28 13:54:43 -04:00
prep
53d5fd1e9b
- Pelvis offsets are now preserved
...
- Fix for CTS-261
2010-10-28 13:40:15 -04:00
Nyx Linden
32bcdd1199
SH-396 WIP fix mac opensource build for mesh viewer
...
Collada library file was being named incorrectly by autobuild,
resulting in the build being unable to find the library even though
it was downloaded. Updated the package, hopefully this will fix the linker error.
2010-10-28 11:44:10 -04:00
Nyx (Neal Orman)
e0ba584ecc
SH-395 WIP fix linux opensource mesh teamcity build
...
cmake wasn't configured to use the right directories on the viewer for
debug libraries. Trying to update the config.
2010-10-27 19:40:03 -04:00
Loren Shih
225ffbba20
Automated merge up from viewer-development
2010-10-27 15:08:21 -04:00
Nyx (Neal Orman)
1aee2f0d4d
pull from hg.lindenlab.com/viewer-mesh to mesh-development
...
Note all future commits should happen in public mesh-development. Will
ping internal devs to make sure they transition over.
2010-10-27 14:27:10 -04:00
Merov Linden
a7143a9998
STORM-418 : merge with viewer-development
2010-10-27 11:06:22 -07:00
Merov Linden
b63b6eeecf
STORM-224 : merge with viewer-development
2010-10-27 11:04:44 -07:00
Merov Linden
269b7c38f4
STORM-311 : merge with viewer-development
2010-10-27 11:02:38 -07:00
Merov Linden
5ad8a2439e
STORM-95 : merge with viewer-development
2010-10-27 10:53:58 -07:00
Kent Quirk
8947724baa
STORM-482; change to allow 1023 characters again in local chat. While fixing this, I noticed that a change to XUI meant that many floaters had tried to set a limit on text length for line_editor components but it didn't take effect because the parameter name was wrong; I changed them to agree.
2010-10-26 23:13:36 -04:00
Merov Linden
ffe475e96e
STORM-418 : Suppress menu items Save to XML and Load from XML from the Develop > XUI menu
2010-10-26 16:08:11 -07:00
Dave Parks
e75fd8beb1
merge
2010-10-26 16:20:00 -05:00
Dave Parks
da04af47cc
Fix for bad binormals.
2010-10-26 16:19:24 -05:00
Dave Parks
dcde5979c3
Anti-alias edge map.
2010-10-26 14:42:09 -05:00
Dave Parks
53beeec0a3
Potential fix for crash in renderBloom.
...
Reviewed by Seraph.
2010-10-26 14:31:20 -05:00
Merov Linden
cdd930d360
STORM-454 : merge with viewer-development
2010-10-26 12:04:40 -07:00
Merov Linden
01e5519323
STORM-454 : Tweak the teleport_coordinate_z width to better align in world map UI
2010-10-26 11:28:39 -07:00
Jonathan Wolk
57cbcdc9ec
Adding back in fix for convex hull size incompatibility after backout of previous checkin.
2010-10-26 11:20:48 -07:00
Jonathan Wolk
0a8d43e844
Backing out latest change to undo static cache file changes
2010-10-26 11:11:20 -07:00
Merov Linden
ebce1a4ea8
STORM-416 : merge with viewer-development
2010-10-26 10:59:37 -07:00
JonathanLinden
e4a5d16be1
Fixed convex hull size incompatibility in mesh assets.
2010-10-26 10:31:48 -07:00
Merov Linden
2e919b6ccd
merge with viewer-development
2010-10-26 10:03:36 -07:00
Merov Linden
a40a2a7a46
STORM-350 : merge with viewer-development
2010-10-25 13:46:36 -07:00
Merov Linden
0977ecca96
STORM-173 : merge with viewer-development
2010-10-25 13:45:06 -07:00
Merov Linden
3116e0d352
STORM-426 : merge with viewer-development
2010-10-25 13:43:22 -07:00
Merov Linden
2a5902f75f
STORM-449 : merge with viewer-development
2010-10-25 13:39:11 -07:00
Loren Shih
92959895e2
Automated merge up from viewer-development
2010-10-25 16:20:37 -04:00
Merov Linden
bf49b56b3a
merge viewer-beta, resolve STORM-341 conflict
2010-10-25 13:13:17 -07:00
Loren Shih
066986a09e
Automated merge up from viewer-development
2010-10-25 16:10:35 -04:00
Merov Linden
1a53efe233
merge viewer-beta to viewer-development
2010-10-25 13:07:56 -07:00
Kent Quirk
80cbe66039
apply fixes for STORM-341, not quite a transplant
2010-10-25 16:06:03 -04:00
Merov Linden
78f291a722
pull viewer-beta in viewer-development
2010-10-25 12:08:58 -07:00
Vadim ProductEngine
ba0d4ccaf4
STORM-341 FIXED Crash on exiting viewer while Outfit Editor is opened in detached Appearance SP.
...
Reason: An inventory observer (LLFilteredWearableListManager) tried to use
a deleted collect functor (LLFilterItem::collector in LLPanelOutfitEdit::mListViewItemTypes).
Fix: De-register (and delete) the observer when the collector gets deleted.
2010-10-25 21:38:22 +03:00
Leyla Farazha
e98eff02ae
DN-181 Chat & IM logs saved in unreadable .llsd instead of .txt - fixing saving of p2p logs
2010-10-25 10:31:47 -07:00
Merov Linden
c0e9594e9d
STORM-173 : use isEmpty() instead of getFirstRootNode() to check selection
2010-10-25 10:27:37 -07:00
Andrew Productengine
158bfc563b
STORM-95 FIXED Fixed hanging of client when incorrect WAV file was passed.
...
As Aimee has found: "The data chunk of nexfire.wav has an incorrect length specified in its header which we blindly trust when reading
the file in check_for_invalid_wav_formats() in llvorbisencode.cpp. It causes an overflow of the file position pointer when reading the file which makes
it start over from the beginning, hanging it in an infinite loop."
- To avoid this situation in future, check for chunk size was added, and if it is declared bigger then it may be, function is interrupted and returns error.
2010-10-25 18:56:04 +03:00
Leyla Farazha
cb5d8d1a92
DN-181 Chat & IM logs saved in unreadable .llsd instead of .txt
2010-10-22 17:41:06 -07:00
Merov Linden
25c4f8ff46
STORM-454 : fix height in world map, allow altitude till 4096m, display altitude on 4 digits
2010-10-22 17:06:18 -07:00
Merov Linden
de6f7e19c4
STORM-423 : merge with viewer-development
2010-10-22 16:18:36 -07:00