Commit Graph

3836 Commits

Author SHA1 Message Date
Lirusaito
af67342969 Merge branch 'master' of git://github.com/siana/SingularityViewer
Conflicts:
	indra/llrender/llvertexbuffer.cpp
Also, reverts indra/newview/skins/default/xui/en-us/panel_audio.xml to before mute-gesture button (For now can be toggled through SinguMuteGestures debug setting)
2012-03-27 07:15:48 -04: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
Lirusaito
d9cbd52ea8 Fix for compiler warning in LLVertexBuffer::setupVertexArray. 2012-03-23 22:45:55 -04:00
Lirusaito
8b25d44bcf Replaced a tab with a space in XML so Windows doesn't show an awkward square there. 2012-03-23 17:21:50 -04:00
Lirusaito
3d6733bed8 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-03-23 17:20:04 -04:00
Siana Gearz
cd7331453a Another avatar .llm update 2012-03-23 15:10:46 +01:00
Shyotl
3d6511f4e1 LLTextureCtrl now creates texture picker when clicked. (behavior if child element handled click was inverted) 2012-03-22 09:36:13 -05:00
Shyotl
5ce6f7eb7d Pesky file manged to escape from previous commit. 2012-03-22 05:43:51 -05:00
Shyotl
90f12f1bb9 Removed some dead code. Refresh avatar textures upon entering customize. Disabled an old emerald hack that seems to contribute to baking issues-- will look into further if it indeed was a problem. 2012-03-22 00:56:10 -05: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
Shyotl
6b5df7194a Added LLInvFVBridgeAction, and modified inventory bridges to use utilize their respective specialized LLInvFVBridgeAction derived classes.
Disabled 'New Folder' option in the recent items panel.
Disabled all 'New *' options in worn items panel.
2012-03-21 02:26:11 -05:00
Shyotl
0fdab061b9 Some spring cleaning. 2012-03-21 02:22:27 -05:00
Shyotl
896f7f5b9b Diabled 'first physics wearable' notice. 2012-03-21 02:18:54 -05:00
Siana Gearz
f885c8667b This might be needed for OS X, Drake says 2012-03-20 06:41:10 +01:00
Shyotl
c07d90a2ba Rename box now properly aligned in the inventory panel. Commented out some ascent stuff pertaining to drag and drop because, well, it seemed weird. 2012-03-19 23:32:48 -05: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
Lirusaito
c3f3db518b Fixed Issue 340, multiple instances of same name breaking translation.
Applies to advanced chat preferences only.
2012-03-19 18:08:17 -04:00
Lirusaito
385ec62e53 Added scale_image="false" to all mute buttons.
This will allow the mute icons to retain their normal look,
with Shyotl's changes to the UI code.
2012-03-14 08:55:10 -04:00
Lirusaito
881524831f Merge branch 'master' of https://bitbucket.org/Lirusaito/singularityviewer 2012-03-14 02:58:45 -04:00
Lirusaito
376be8b990 Spelling fix in a comment. 2012-03-14 02:53:44 -04: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
Shyotl
406ff6872f Removed some pointless console spewage, and resolved a crash in avatar picks panel. 2012-03-10 20:02:22 -06: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
Shyotl
55e589375f scroll-list column headers now work on single-click. Also improved focus handling for scroll-lists. 2012-03-05 18:30:36 -06: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