Shyotl
f9bcbab5f3
Win compile fix. Including stdint.h explodes in vc2010, so #if'd it out for windows.
2011-08-05 21:39:43 -05:00
Shyotl
4dd888353d
Merge branch 'future' of git://github.com/siana/SingularityViewer.git into V2Mesh
2011-08-05 20:12:59 -05:00
Shyotl
550fa0a160
Merge branch 'future' of https://github.com/AlericInglewood/SingularityViewer.git into V2Mesh
...
Conflicts:
indra/newview/llspatialpartition.cpp
2011-08-05 19:40:35 -05:00
Shyotl
7bcd259821
Added ShyotlRenderVBOStrideMode to toggle between strided and unstrided VBOs.
2011-08-05 19:24:17 -05:00
Aleric Inglewood
5005f4aa1d
Never pass an empty string as directory path to the filepicker.
...
Should work around the problem as described in
http://code.google.com/p/singularity-viewer/issues/detail?id=117
2011-08-05 14:53:11 +02:00
Aleric Inglewood
7e7a238255
Merge remote-tracking branch 'origin/master'
2011-08-05 14:27:54 +02:00
Shyotl
9cc398e939
Occlusion now using LLVertexbuffer class.
2011-08-05 02:55:13 -05:00
Shyotl
b75a28ec15
Cleanup. Applied http://hg.secondlife.com/mesh-development/changeset/3031f266784a
2011-08-05 01:18:27 -05:00
Aleric Inglewood
881d065220
Wrap sGlobalRawMemory in AIThreadSafe.
...
This is accessed by different threads.
Other globals like it might also be
accessed by different threads, this has
to be investigated.
2011-08-05 00:05:08 +02:00
Siana Gearz
fc839cb2ff
This should fix the settings
2011-08-04 22:44:25 +02:00
Aleric Inglewood
20d2012fc3
Fix a typo.
2011-08-04 22:41:37 +02:00
Siana Gearz
174a33beb3
Variable size region support, by RevolutionSmythe
2011-08-04 22:20:25 +02:00
Shyotl
2c489d7741
Cleaned up polymesh (mesh vectors/normals size match VBO vectors/normals size to allow memcpy). Prep for vbo testing.
2011-08-04 01:38:56 -05:00
Siana Gearz
8d72f6f516
This temporarily fixes inventory problems on Aurora.
...
DO NOT MERGE THIS INTO FUTURE.
2011-08-04 03:20:51 +02:00
Siana Gearz
8787d37d5c
Build fix for that
2011-08-03 23:16:00 +02:00
Siana Gearz
f65624b242
Debug build fixes, linux32
2011-08-03 17:41:21 +02:00
Siana Gearz
d255bfa6f7
Variable size region support, by RevolutionSmythe
2011-08-03 17:40:06 +02:00
Siana Gearz
393ee9d3eb
This should fix the settings
2011-08-03 17:36:21 +02:00
Siana Gearz
87070be7e3
Merge branch 'master' of github-siana:siana/SingularityViewer into future
2011-08-03 01:01:00 +02:00
Aleric Inglewood
27c91e2571
Don't instantiate LLTextParser::getInstance before user logged in.
2011-08-02 23:26:02 +02:00
Shyotl
4f8186b17e
Debug symbols for llcommon.dll on windows.
2011-08-02 16:21:44 -05:00
Aleric Inglewood
414666ec90
Merge remote-tracking branch 'tigh/master'
2011-08-02 21:05:50 +02:00
TighMacFanatic
f54ca35d1b
Fix label on disable TP and login screen options.
2011-08-02 14:56:18 -04:00
Player Dagostino
258fe82db7
Fix a conflict with tut arising when compiling with gcc 4.6. It also looks like tut::test_result::skip got renamed to tut::test_result::skipped in revision 190.
2011-08-02 20:28:54 +02:00
Player Dagostino
a2313b026c
Apply fix from SNOW-792 for textures rebaking over and over.
2011-08-02 20:21:02 +02:00
Player Dagostino
53182cc4cb
It looks like some binary releases of boost::program_options might not contain split_unix(). Let's not call it.
2011-08-02 20:19:26 +02:00
Player Dagostino
a45de10024
Fix a problem not letting plugins work when the client is built on RedHat and derived systems (Fedora is affected too). Completely avoid apr_dso_load() on Linux (they modified it to open libraries with RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND). Get a standard DSO handle with RTLD_NOW | RTLD_GLOBAL flags instead, and convert it to a valid APR one by using apr_os_handle_put().
2011-08-02 20:15:58 +02:00
Player Dagostino
f3d6931fc3
Another port from CoolViewer of the notecard floater, featuring a menu and search/replace.
2011-08-02 20:07:55 +02:00
Player Dagostino
bcc541f3f2
Fix a problem with the media filter not working properly when the user turns the streams on. Previously it only worked when the avatar tpd or the stream source changed. Also set the filter on by default.
2011-08-02 20:04:19 +02:00
Player Dagostino
3b168065d5
Another port of a great patch from CoolViewer that lets users set the maximum number of actual visible avatars when impostors are on.
2011-08-02 20:01:20 +02:00
Player Dagostino
5009b0544e
Adaptation of the CoolViewer patch that allows Linux users to paste by middle-clicking.
2011-08-02 19:58:47 +02:00
Player Dagostino
4b98d69c2f
Fix the mouse flickering problem inherited by Ascent
2011-08-02 19:55:25 +02:00
Player Dagostino
9ec40dbcac
Slight modification of the wrapper to let qt find its optional plugins in the pathname
2011-08-02 19:53:03 +02:00
Player Dagostino
a9028b5c17
Add some missing clothing entries to the viewer and pie menus
2011-08-02 19:47:33 +02:00
Siana Gearz
82fc160abe
Look and criticize, Aleric
2011-08-02 02:16:31 +02:00
Siana Gearz
3b97a575d1
Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
2011-08-02 01:25:46 +02:00
Shyotl
f5915ab83c
Some fixes and cleanup for strided vbos. Added LLStrider::assignArray to clean up some loops, as well as replace LLVector4a::memcpyNonAliased16. Works with both unstrided and strided vbo elements, and alignment padding (LLVec4->LLVec3,etc)
2011-08-01 18:19:08 -05:00
Siana Gearz
04b507d286
Merge branch 'future' of git://github.com/AlericInglewood/SingularityViewer into future
2011-08-02 01:14:28 +02:00
Siana Gearz
45c87257ed
Debug build fixes, linux32
2011-08-02 01:13:53 +02:00
Aleric Inglewood
ef6737d0cd
Shorten the time between freeing the lock and setting mStatus to STOPPED.
2011-08-02 00:05:14 +02:00
Aleric Inglewood
13be594651
Add proper locking around between threads shared variables and the calls to signal() and wait().
2011-08-01 23:46:54 +02:00
Aleric Inglewood
313e008f61
Compile fixes to compile LL_DEBUG, and missing header (for linux?)
2011-08-01 23:33:56 +02:00
Aleric Inglewood
d828f858c9
LLFrameTimer review and resulting changes.
...
This makes the class API a bit more sane, although
only a bit, because I had to leave it working with
possibly new code merged in from LL: the API can't
really change. I also removed some unused code.
While reviewing how LLFrameTimer worked however,
I did find a few instances where things where broken:
* sFrameDeltaTime wasn't correctly updated (more
than once per frame and therefore erratic). This
only influenced scrolling speed, but still.
* While dragging an inventory item, the scroll
arrows of a tab container didn't work
(LLTabContainer::handleDragAndDrop).
* Map zoom interpolation was broken (it interpolated
between A and B, but used the already updated
interpolation for A the next frame...
(added mCurZoomValInterpolationStart).
2011-08-01 21:00:27 +02:00
Siana Gearz
6cfaecf972
GCC buildfixes
2011-08-01 20:42:06 +02:00
Siana Gearz
aa469d860f
Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
2011-08-01 19:56:33 +02:00
Siana Gearz
fcd37f3a45
Linuxy fixes
2011-08-01 19:55:57 +02:00
Shyotl
0bd444de5f
A few more rigging related things added in. Also fixed vertex weights
2011-08-01 03:53:25 -05:00
Shyotl
2aa4aa78e2
Added physics settings to object features panel. Brought in mesh 'prim cost' fetching and now display cost in edit floater if mesh is enabled.
2011-08-01 01:33:07 -05:00
Shyotl
5e9cec2cc5
LLTextParser now a singleton.
2011-07-31 19:09:47 -05:00
Shyotl
3c244e6df0
Added new setCommitCallback and setValidateCallback to LLUICtrl, using boost::signals2. Kept legacy variants for now since they are just used too frequently to remove right now.
2011-07-31 19:08:08 -05:00
