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
Shyotl
07ff467831
Neck and root attachment points had invalid group numbers.
2012-03-28 19:41:04 -05:00
Shyotl
86c65e492d
Use FBO for dynamic textures if possible. ( https://bitbucket.org/simon_linden/viewmaster/changeset/24cdc2fee3d9 )
2012-03-28 19:40:37 -05:00
Siana Gearz
4770e7724c
Whoopsie, forgot to commit a trivial merge fix
2012-03-29 02:03:46 +02:00
Siana Gearz
f05edda4f4
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/newview/llfloateravatarlist.cpp
indra/newview/llfloatermessagelog.cpp
indra/newview/llstartup.cpp
indra/newview/llviewermenu.cpp
indra/newview/llviewermessage.cpp
indra/newview/skins/default/xui/fr/menu_inventory.xml
2012-03-28 22:27:45 +02:00
Lirusaito
8805e3fb27
Nomade Zhao's 4 fixes for translation. Re: Issue 340
2012-03-28 00:00:42 -04:00
Lirusaito
64d8397ea5
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-03-27 19:48:05 -04:00
Siana Gearz
be9f3178c0
Fixies, missed files
2012-03-28 01:45:10 +02:00
Lirusaito
4d4496fc4d
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-03-27 19:29:24 -04: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
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