Commit Graph

2179 Commits

Author SHA1 Message Date
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
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
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
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
80e53ebb2b Viewer tags kill adjustments 2012-03-22 05:37:38 +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
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
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
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
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
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
Shyotl
d54c86e1df UI polish (scrollbar focus, tearoff menus), plus drag and drop fix. 2012-03-04 23:15:53 -06:00
Siana Gearz
0a11f09918 Tiny fixies from Phoenix 2012-03-04 09:39:28 +01:00
Shyotl
2d75e8fda6 Added mouse_wheel_opaque attribute for scroll_list. Made several advanced submenus tear-off-able. Updated menu hover logic (removed MAX_MOUSE_SLOPE_SUB_MENU check) to make menus behave more predictably to cursor movement. Improved menu handling when it runs off of screen (and only uses vertical flip if menu item is in lower half of screen) 2012-03-03 22:11:53 -06:00