f74b7274d2
SH-2400 FIXED crash on model upload.
...
Added checks for LoD strings array index bounds.
2011-09-13 19:45:04 +03:00
b2853c1a74
merge
2011-09-13 12:11:11 -04:00
b56e4cf0e4
BUILDFIX GCC fixing unused variable
2011-09-12 14:51:22 -04:00
18af6e397e
merge changes for storm-1590
2011-09-09 12:43:07 -04:00
66aabf8a4f
merge
2011-09-08 15:55:17 -04:00
2e652ce660
Fix for SH-2210
2011-09-08 15:54:52 -04:00
4e0ba4fc84
Automated merge with https://bitbucket.org/paul_productengine/sh-2309
2011-09-08 19:18:11 +03:00
f44b44400b
SH-2309 FIXED 'Triangles limit' combo value updating problem.
...
Fixed updating 'Error threshold' spinner control visibility.
2011-09-08 18:47:37 +03:00
5a03453b2c
Corrected license information in llsingleton_test.cpp.
2011-09-08 11:03:21 -04:00
89b9800579
merge back beta tags
2011-09-08 11:02:28 -04:00
7d381c6596
LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()
2011-09-08 10:43:07 -04:00
3d295fbf27
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-07 18:14:40 -04:00
286342f705
STORM-1541: Change llassert() to llassert_always(): unit tests expect.
...
Now that we have unit tests that require assertion failure if you try to
delete an LLInstanceTracker subclass instance with an iterator loose, having
llassert() "sometimes" compile away (whimsically, depending on platform as
well as build type!) makes those tests fail. Use llassert_always() instead.
2011-09-07 18:03:25 -04:00
b4a1d339fc
STORM-1541: Add LLInstanceTracker tests for active-iterator asserts.
...
The recent class-static LLInstanceTracker::instance_iter and key_iter
reference count is intended to guard against deleting an instance of an
LLInstanceTracker subclass during iteration. Add tests for that functionality.
2011-09-07 17:29:08 -04:00
b8fddce34d
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
2011-09-07 16:40:40 -04:00
0e4586a42f
SH-2371 FIXED "Not allowed to upload message" flashes when uploader dialog comes up
...
- This is a regression bug caused by changeset:20407
2011-09-07 20:53:44 +03:00
955bcbb951
Merge mesh-development with sh-2309
2011-09-07 18:46:51 +03:00
bb085a45db
Merge from seth_mesh_dev to paul_mesh_dev
2011-09-07 16:15:54 +03:00
8c6f752982
STORM-1541: Hoist LLInstanceTracker::getMap_() to base getStatic().
...
Generalize the notion of getting some chunk of "static" storage: introduce
LLInstanceTrackerBase::getStatic() template method. Define StaticData struct
containing the InstanceMap (or InstanceSet, for that specialization) along
with the S32 that caused the VS2010 linker so much grief. Completely eliminate
that S32 as an actual class-static member, qualifying all references with the
struct returned by getStatic().
In LLInstanceTrackerBase::getInstances(), use one std::map lookup instead of
three.
2011-09-06 22:07:49 -04:00
f73b795bb7
Renamed LLCurl::check_curl_code() and LLCurl::check_curl_multi_code() to prevent ambiguous name build error.
2011-09-06 17:33:18 -04:00
82b1b1bc6e
merge changes for storm-1588
2011-09-06 17:00:55 -04:00
e2dea0b494
merge changes for vwr-26823
2011-09-06 17:00:23 -04:00
a8d49f7cf5
LLProxy code review fixes.
...
* Removed check_curl_code and check_curl_multi_code from the global namespace.
* Added comments documenting which thread the public methods of LLProxy should be called from.
* Corrected grammar in LLSingleton.h
* Fixed a buffer scope problem in llpacketring.cpp.
2011-09-06 16:54:53 -04:00
aaee960dd3
SH-2309 New icons added to mesh upload floater.
2011-09-06 20:16:51 +03:00
08c0de785f
merge
2011-09-06 09:42:11 -04:00
117bd5af1b
SH-2309 FIXED Priority modifications to mesh uploader UI
...
- Replaced magic number with constant
- Commented my magic numbers
2011-09-06 16:23:53 +03:00
d63b72fb53
SH-2347 FIXED selecting the value in Stitching Type drop down.
2011-09-05 20:38:17 +03:00
03f835c87e
merge
2011-09-05 19:51:19 +03:00
fc45e9cbf6
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-02 20:24:06 -07:00
f6a8fbe19f
merge changes for .v-pb
2011-09-02 16:03:20 -04:00
a2a73feed0
merge back beta tags
2011-09-02 16:03:09 -04:00
0ab6eee099
merge changes for storm-1027
2011-09-02 13:48:29 -04:00
8efd992d50
correct DOS line endings
2011-09-02 13:48:01 -04:00
ba2ae6bc95
re-write the hash table code to eliminate potential flaws and simplify the implementation.
2011-09-02 11:17:03 -06:00
97c6672634
SH-2171 Commented-out code cleanup.
2011-09-02 20:08:12 +03:00
b782f9b0b4
SH-2309 WIP Label colors changed in mesh upload floater.
2011-09-02 20:04:48 +03:00
028c34e0ff
SH-2309 Model preview floater LoD tab updated.
...
- Combo boxes for LoD source added for each level
- New option "Use LoD above" added for copying the model from higher LoDs.
- Various LoD settings and related controls removed.
2011-09-02 17:36:54 +03:00
1f149a432b
merged .hgtags
2011-09-02 10:23:46 -04:00
5da2d4c853
SH-2309 WIP Priority modifications to mesh uploader UI
...
- Changed representation of Retain% control values
- Added "Choose one..." item to the LOD combo_box
2011-09-02 17:14:07 +03:00
deddcfb8c5
Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aa
2011-09-02 10:13:04 -04:00
fcc51bd5b0
increment viewer version to 3.0.5
2011-09-02 09:46:48 -04:00
21ad5e0a0e
Added tag 3.0.4-start for changeset 586907287be5
2011-09-02 09:46:16 -04:00
512c057c2d
VWR-26823 FIXED Removed DigiNotar CA certificate.
2011-09-02 15:43:25 +03:00
76f867c891
merge
2011-09-01 17:47:26 -04:00
da7f2af75c
Fix for model metrics
2011-09-01 17:47:05 -04:00
9a1e8d78fe
Merge
2011-09-01 17:06:15 -04:00
342005cd92
Clarified the reason for adding the deleteSingleton method to LLSingleton. Added a simple unit test to verify the functionality of the deleteSingleton method.
2011-09-01 17:05:22 -04:00
6ab0bc8789
LLProxy start of code review cleanup.
2011-09-01 16:44:04 -04:00
15ec41f95f
Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aa
2011-09-01 14:34:25 -04:00
004de653aa
SH-2309 WIP Priority modifications to mesh uploader UI
...
- Bind "Cosine%" param with "Smooth" combo box.
- Corrected some wording.
- Little UI polish. Line with results in Physics tab.
- Changed ordering of LOD combo box items.
2011-09-01 19:01:46 +03:00
Seth ProductEngine