Commit Graph

2410 Commits

Author SHA1 Message Date
Lirusaito
e729bd80ce Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-05-17 02:09:20 -04:00
Shyotl
9eda9ad462 GCC doing its thing (by being picky). 2012-05-17 00:47:00 -05:00
Shyotl
dbe50efc10 Added 'make outfit' back to appearance editor. 2012-05-16 23:25:01 -05:00
Shyotl
d1540040a8 Added extra callback registering methods to LLUICtrl 2012-05-16 23:22:57 -05:00
Shyotl
bf28ce4239 Few nullchecks, and fixed broken logic in LLPanelAvatar::canClose() 2012-05-16 12:06:05 -05:00
Drake Arconis
8192b547a8 Merge branch 'V2MultiWear' into v2mwArx 2012-05-15 10:37:55 -04:00
Drake Arconis
8dc0e16f0a Modified wrapper script with new options for FMOD Ex 2012-05-15 10:37:33 -04:00
Drake Arconis
5a2d160ac4 Fixed FMOD Ex support under linux 2012-05-15 10:36:48 -04:00
Lirusaito
e20b383aa0 Small changes that seem to make clang happier. 2012-04-30 23:48:30 -04:00
Lirusaito
a82953d0d0 Few more GCC 4.7 fixes.
include unistd when not on windows.
2012-04-29 00:25:40 -04:00
Lirusaito
16c2235510 Fixed About Floater's background.
clear and transparent both refer to the same thing, code fix to reflect this.
2012-04-28 21:34:24 -04:00
Lirusaito
8e6063e7b9 Fixed compile errors for gcc4.7 (also reported by clang) 2012-04-28 21:29:52 -04:00
Lirusaito
4799899317 Fritigern's script updates, brought in!
Also more stray spaces removed with care~
2012-04-26 22:09:58 -04:00
Lirusaito
37d2e41618 Spelling fix.
appearance isn't spelled appearence
2012-04-25 05:00:02 -04:00
Lirusaito
fd183e01b5 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-24 21:33:52 -04:00
Shyotl
75ef768e7f Fixed alternate buildtool modes not being selectable (texture, scale, etc) 2012-04-24 17:12:54 -05:00
Shyotl
35bd8d90be Subpanels created through ui factorymap callbacks which also call LLUICtrlFactory::getInstance()->buildFloater in said callbacks (opposed to using the filename attrib due to that not supporting sub-factorymap callbacks) now get a position fixup determined by parents position attribs for that subpanel after being built. 2012-04-24 17:12:13 -05:00
Lirusaito
a5faea64d9 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-24 04:17:31 -04:00
Shyotl
e7649d8f1c Avoid re-issuing LLPanel::postBuild() needlessly. Essential to avoid callbacks being double-registered to ui element signals (eg, LLOverlayBar::toggleMusicPlay was being called twice per click). 2012-04-24 03:11:10 -05:00
Lirusaito
3eccd251c0 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-22 21:36:59 -04:00
Shyotl
b3d91d816d Diagnostic llinfos spewage for attachment process. 2012-04-22 19:45:07 -05:00
Shyotl
3cc37fb12b LLAgentCamera update. Culled a bunch of dead code from llappviewer. Moved build-mode toggle off into lltoolmgr. 2012-04-22 19:42:37 -05:00
Shyotl
71a29e347e Tweaked camera panning into appearance edit mode. 2012-04-22 12:52:25 -05:00
Shyotl
6b66c33b47 Killed some redundant code in customize floater. 2012-04-21 20:44:10 -05:00
Lirusaito
d03b7d052d Added EnableGestureSoundsSelf to allow playing the user's gesture sounds even while EnableGestureSounds is false. 2012-04-21 14:02:11 -04:00
Lirusaito
640d9489cb Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-04-21 12:03:42 -04:00
Siana Gearz
3d40f96dfe Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-21 13:19:02 +02:00
Siana Gearz
817085c172 Probably antivirus-friendlier SLPlugin
To detour SetUnhandledExceptionFilter to a dummy function, don't use WriteProcessMemory which
is usually used for inter-process writes and debugging. Instead, use more common technique
based on VirtualProtect.
2012-04-21 13:15:03 +02:00
Siana Gearz
5ce00cecef Fix crash in voice device set-up 2012-04-21 12:57:33 +02:00
Lirusaito
bb1d94ba0e Fix ambiguous overload in llstartup.cpp so the viewer compiles on linux 2012-04-20 17:26:44 -04:00
Shyotl
5ba68ed763 Updated buy land floater a bit. Fixed a persistent shutdown crash. Updated texture Texture Console. 2012-04-17 18:44:41 -05:00
Shyotl
ee84500735 Added some cursory direct-delivery support. 2012-04-16 23:33:34 -05:00
Shyotl
275c85f482 Missed two shaders in earlier v3 merge. 2012-04-16 23:22:18 -05:00
Shyotl
f584cb3b3b Updated drag and drop impl. Uses LLDictionary, and also IDs DnD operations. 2012-04-16 23:20:27 -05:00
Shyotl
5517266bda Missing translation strings. (Need to bring the french strings.xml up to date too, at some point.) 2012-04-16 23:17:47 -05:00
Shyotl
59fdf3b6e1 V3 merge pt 2 / 2 2012-04-13 23:24:39 -05:00
Shyotl
e1d243272f V3 merge part 1 / 2. 2012-04-13 22:39:39 -05:00
Shyotl
3bd9ffe135 Fixed an annoying snapshot assertion (would buffer overrun if assertions are disabled) 2012-04-13 22:17:19 -05:00
Siana Gearz
fd1896536e Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-12 19:35:28 +02:00
Shyotl
1d402bfe39 Verify vert attrib disable state if only running in non-fixed-function. 2012-04-12 10:37:37 -05:00
Shyotl
06068a0361 Disable FBOs on intel gpus running with pre-GL3.x drivers. 2012-04-12 10:36:28 -05:00
Shyotl
18ac23554f Texturecache bugs! "cache_size -= entries[idx].mBodySize" must happen before removeEntry in LLTextureCache::purgeTextures, as removeEntry zeros "entries[idx].mBodySize". "mTexturesSizeTotal -= entry.mBodySize"; must happen before "entry.mBodySize = 0" in LLTextureCache::removeEntry because, well, duh. 2012-04-12 10:35:42 -05:00
Shyotl
b49ad1cd34 RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater. 2012-04-12 10:29:45 -05:00
Siana Gearz
01d6095242 Apparently overestimating j2c size is always a bad idea 2012-03-31 03:45:22 +02:00
Siana Gearz
7774fe7f04 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
Conflicts:
	indra/newview/lldynamictexture.cpp
2012-03-31 01:54:53 +02:00
Siana Gearz
29e308b5ca Restore meshes and morphs and login menu width 2012-03-31 01:16:09 +02:00
Shyotl
e7bcf1e9ec Modified LLUserAuth to use LLSD when parsing login response parameters. Will facilitate easy wholesale replacement with LLLoginInstance in the future. 2012-03-30 09:51:30 -05:00
Shyotl
0453971a85 Small tweak from v3 regarding texture scaling. 2012-03-30 09:46:54 -05:00
Shyotl
4da4d5fd50 Added missing notification entries for when DebugAvatarRezTime=TRUE 2012-03-30 09:45:28 -05:00
Shyotl
db4e36a99a Moved Neck and Root attach/detach entries to empty pie slices in the 'Torso' sub-menu. 2012-03-28 23:04:58 -05:00