Aleric Inglewood
|
7234e63ce1
|
Merge remote-tracking branch 'siana/master'
Conflicts:
indra/llrender/llvertexbuffer.cpp
Resolved: needed two casts for 64bit warning.
|
2012-06-27 04:10:20 +02:00 |
|
Siana Gearz
|
be9f3178c0
|
Fixies, missed files
|
2012-03-28 01:45:10 +02:00 |
|
Siana Gearz
|
d86f67f818
|
In hindsight, not letting OpenJPEG to error out nicely was a bad idea.
|
2012-03-28 00:26:56 +02:00 |
|
Siana Gearz
|
3acf6dc001
|
Another stab at making textures work as they should
|
2012-03-27 16:23:55 +02:00 |
|
Siana Gearz
|
ce1607cf17
|
Plugging the mesh crash - thanks FS team!
|
2012-03-26 22:58:05 +02:00 |
|
Siana Gearz
|
fee59e83b8
|
Fix size estimation
|
2012-03-26 19:53:04 +02:00 |
|
Siana Gearz
|
caaba76921
|
Firestorm workaround for alloc failure
|
2012-03-26 15:05:35 +02:00 |
|
Siana Gearz
|
70438fa06f
|
Catching up with Lindies part 3
|
2012-03-26 15:01:53 +02:00 |
|
Siana Gearz
|
3f0f955a76
|
Catching up with Lindies part 2
|
2012-03-25 10:47:20 +02:00 |
|
Siana Gearz
|
196e9d6c78
|
Unbreaking Ctrl+W the right way
|
2012-03-25 09:31:06 +02:00 |
|
Siana Gearz
|
459751f206
|
Catching up with Lindies part 1
|
2012-03-25 09:31:03 +02:00 |
|
Siana Gearz
|
2e5ea4f5a7
|
Fix proxy setting initialization
|
2012-03-24 16:19:14 +01:00 |
|
Siana Gearz
|
cd7331453a
|
Another avatar .llm update
|
2012-03-23 15:10:46 +01:00 |
|
Siana Gearz
|
8334277838
|
Want ridiculously small viewer window? Here you go.
|
2012-03-22 06:03:05 +01:00 |
|
Siana Gearz
|
80e53ebb2b
|
Viewer tags kill adjustments
|
2012-03-22 05:37:38 +01:00 |
|
Siana Gearz
|
1e9e7d701d
|
fix for SH-2941: crash at LLCurl::Easy::~Easy() (Bao Linden)
|
2012-03-21 21:31:42 +01:00 |
|
Siana Gearz
|
a57ad256b5
|
Fix RLVa not to give viewer channel and version to anyone
|
2012-03-21 19:50:21 +01:00 |
|
Siana Gearz
|
b4bdb7ca36
|
HTTP texture fetch endless append fix, by Laika Tungsten
Please don't consider this ready yet.
|
2012-03-21 19:30:11 +01:00 |
|
Siana Gearz
|
f885c8667b
|
This might be needed for OS X, Drake says
|
2012-03-20 06:41:10 +01:00 |
|
Siana Gearz
|
cc459cb582
|
Alison Alena's new avatar mesh weights
|
2012-03-20 04:02:49 +01:00 |
|
Siana Gearz
|
8b8fe82c8e
|
Correct facepalm in llmessage port
|
2012-03-20 03:17:37 +01:00 |
|
Aleric Inglewood
|
1023088c0d
|
Fix 64-bit compile warning.
|
2012-03-13 16:34:45 +01:00 |
|
Aleric Inglewood
|
b18bc08600
|
Add AIAccessConst, AISTAccess, AISTAccessConst, ...
Also added AIThreadSafeSingleThread, AIThreadSafeSingleThreadDC
and AITHREADSAFESINGLETHREAD
|
2012-03-13 16:32:10 +01:00 |
|
Siana Gearz
|
5d6b925823
|
We have persistent console and multi-instance settings and don't need them forced on debug builds
|
2012-03-12 19:54:44 +01:00 |
|
Aleric Inglewood
|
fffbda1b90
|
Add ASSERT_SINGLE_THREAD
|
2012-03-12 04:37:55 +01:00 |
|
Aleric Inglewood
|
8c721c4a69
|
Merge/collision fix.
Belonged in previous commit really.
|
2012-03-12 04:37:16 +01:00 |
|
Siana Gearz
|
21170e1e18
|
Fix build on Windows
|
2012-03-12 00:35:47 +01:00 |
|
Aleric Inglewood
|
87b8f6e076
|
Merge with siana/master. Resolved conflicts.
Conflicts: removal of trailing space (to be the same as
viewer 3) in one instance collided with a patch of Siana.
I had moved isSelfLocked.
|
2012-03-11 03:21:45 +01:00 |
|
Aleric Inglewood
|
52b4008968
|
Prepare synchronization with viewer-development.
Synchronization will be complete after viewer-development
gets my LLAPRPool and LLAPRFile patch that I'm currently
working on.
|
2012-03-06 23:10:43 +01:00 |
|
Aleric Inglewood
|
c1133cb932
|
Use LLAPRPool
apr_pool_t* should not be used anywhere, except where a comment
explicitely says it's ok. This one apparently sneeked in in the
meantime.
|
2012-03-06 17:04:05 +01:00 |
|
Siana Gearz
|
1db7221508
|
And of course i forgot to add some files
|
2012-03-06 09:11:36 +01:00 |
|
Siana Gearz
|
83a3bbb48e
|
Fixies from viewer-development
|
2012-03-06 09:01:01 +01:00 |
|
Siana Gearz
|
8b6f462d13
|
Wholesale update of llmessage to V3.2
Note that this removes message logger for now.
|
2012-03-06 07:31:15 +01:00 |
|
Siana Gearz
|
2b833129c5
|
Merge branch 'master' of /cygdrive/c/git/SingularityViewer
|
2012-03-05 19:36:29 +01:00 |
|
Siana Gearz
|
efd1b2bfa9
|
French translation update and file cleanup
|
2012-03-05 19:17:07 +01:00 |
|
Siana Gearz
|
5eb90ef9cd
|
Preference button to clear settings
|
2012-03-05 19:05:30 +01:00 |
|
Siana Gearz
|
edd1b4d8e7
|
Avoid crashes in skins by using proper intended filenames
|
2012-03-05 18:57:24 +01:00 |
|
Siana Gearz
|
b67fa864ff
|
First shot at fixing font fallback
|
2012-03-05 18:18:37 +01:00 |
|
Siana Gearz
|
0a11f09918
|
Tiny fixies from Phoenix
|
2012-03-04 09:39:28 +01:00 |
|
Siana Gearz
|
5f7f7b7d61
|
Unsegfault memory tracker on Windows
|
2012-03-01 23:38:48 +01:00 |
|
Siana Gearz
|
251b0fa5c0
|
Memory consumption in statistics floater
|
2012-03-01 13:49:47 +01:00 |
|
Siana Gearz
|
ab26e1008f
|
RLVa crash fix, thx Kitty!
|
2012-02-29 19:05:24 +01:00 |
|
Siana Gearz
|
ecc396219d
|
I can't shake the feeling that timesliced cache clearing is botched. Better safe, byebye.
|
2012-02-29 17:22:24 +01:00 |
|
Siana Gearz
|
a7d70878b7
|
Log threadcount together with memory
|
2012-02-29 16:03:11 +01:00 |
|
Siana Gearz
|
baad415f0d
|
Correcting broken link icon, killing unused files
|
2012-02-29 13:58:35 +01:00 |
|
Siana Gearz
|
840cb29f84
|
potential voice crash fix
|
2012-02-25 17:18:02 +01:00 |
|
Siana Gearz
|
0bdf54e6d9
|
This fixes Copy+Wear from object
|
2012-02-24 03:27:24 +01:00 |
|
Siana Gearz
|
10af9d64f2
|
One day this will be a memory stat
|
2012-02-24 03:26:06 +01:00 |
|
Siana Gearz
|
a76b0cb9da
|
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
|
2012-02-23 18:51:49 +01:00 |
|
Aleric Inglewood
|
0450358df3
|
Clean up after Linden Lab
|
2012-02-23 18:50:28 +01:00 |
|