RevolutionSmythe
8fc875cee8
Set up reading the grid message from the get_grid_info from Aurora if it exists.
2011-08-18 20:56:20 +02:00
RevolutionSmythe
d84140ead9
Add Aurora to the grid info platform list. Attempt to stop sending "resident" as the last name, except with Second Life.
2011-08-18 20:56:03 +02:00
RevolutionSmythe
3fa0ef5129
Add some of the new pieces to the grid manager panel (not fully hooked up) and hide the values that the grid managers are supposed to set.
2011-08-18 20:54:33 +02:00
Siana Gearz
8e5c8a0f10
Merge branch 'master' of ../singularity into future
...
Conflicts:
indra/newview/llviewerparcelmgr.cpp
indra/newview/llviewerregion.cpp
2011-08-18 19:41:27 +02:00
Siana Gearz
05c132c342
Correct, complete user profile path on Windows
2011-08-18 19:36:12 +02:00
Aleric Inglewood
923c8d32ef
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-18 19:36:11 +02:00
Siana Gearz
39b18cd2ca
Build fix for that
2011-08-18 19:36:11 +02:00
Siana Gearz
e70bc6b800
Variable size region support, by RevolutionSmythe
2011-08-18 19:36:01 +02:00
Aleric Inglewood
3bde58d970
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-18 19:32:45 +02:00
Aleric Inglewood
a43f1ee299
Fix a typo.
2011-08-18 19:32:45 +02:00
Aleric Inglewood
f297068ec0
Don't instantiate LLTextParser::getInstance before user logged in.
2011-08-18 19:32:45 +02:00
TighMacFanatic
2ceebebb49
Fix label on disable TP and login screen options.
2011-08-18 19:32:44 +02:00
Aleric Inglewood
dfa10281ea
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-18 19:30:43 +02:00
Aleric Inglewood
7a739f4915
Minor documentation fixes.
2011-08-18 19:30:42 +02:00
Siana Gearz
6aff0002fa
Merge branch 'future' of github-siana:siana/SingularityViewer into future
2011-08-18 19:26:22 +02:00
Siana Gearz
e6de1e0d5a
Merge branch 'future' of git://github.com/AlericInglewood/SingularityViewer into future
2011-08-11 00:55:22 +02:00
Siana Gearz
c6e0c2f323
This should fix the settings
2011-08-11 00:53:17 +02:00
Siana Gearz
06615a580e
Silly kitty me -.-
2011-08-11 00:51:09 +02:00
Siana Gearz
e9777f25a4
OSSL support by Fritigern, fixes #122
2011-08-10 23:57:43 +02:00
Siana Gearz
23c5d5dd48
Merge branch 'V2Mesh' of git://github.com/Shyotl/SingularityViewer into future
...
Conflicts:
indra/newview/lltexturefetch.cpp
2011-08-10 23:21:14 +02:00
Siana Gearz
2cb0dedbd1
This should fix KV TVs
2011-08-08 02:39:29 +02:00
Siana Gearz
5f4328767b
Debug needs SSE2 now too
2011-08-07 22:40:36 +02:00
Siana Gearz
2e88db37ad
Signed warning in texture fetcher
2011-08-07 22:32:07 +02:00
Siana Gearz
ab41bf00c4
Merge branch 'V2Media' of git://github.com/Shyotl/SingularityViewer into future
2011-08-07 20:35:34 +02:00
Aleric Inglewood
3d1863c1b5
Make sure we assign name before mStatus
2011-08-07 18:47:01 +02:00
Shyotl
1e7415095c
mCurlGetRequest->process() kersploded. Debugger is being dumb, so adding an assertion for now.
2011-08-06 18:17:55 -05:00
Shyotl
a5f38565fa
Henri-inspired tweakage.
2011-08-06 18:14:54 -05:00
Shyotl
9aa26648c9
Added CurlUseMultipleThreads (requires restart to change)
2011-08-06 02:29:04 -05:00
Shyotl
f1759e0a96
Old-code related to sim-quota cleaned up.
2011-08-06 02:27:06 -05:00
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
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
Siana Gearz
fc839cb2ff
This should fix the settings
2011-08-04 22:44:25 +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
87070be7e3
Merge branch 'master' of github-siana:siana/SingularityViewer into future
2011-08-03 01:01:00 +02:00
Shyotl
4f8186b17e
Debug symbols for llcommon.dll on windows.
2011-08-02 16:21:44 -05: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
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