Commit Graph

2309 Commits

Author SHA1 Message Date
Lirusaito
c2ee420917 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-03-01 18:16:39 -05: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
Lirusaito
74a1ba0d1e Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-02-29 10:52:26 -05: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
Lirusaito
0dc05a39e6 Use Ctrl-shift-D for creating a landmarks, instead, and fix previous misplacement of the shortcut. 2012-02-28 13:05:06 -05:00
Siana Gearz
840cb29f84 potential voice crash fix 2012-02-25 17:18:02 +01:00
Lirusaito
72fe406f64 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-02-24 18:39:25 -05:00
Lirusaito
90ac174260 Added Ctrl-D for creating a landmark
Most browsers use this for creating bookmarks, landmarks are pretty much
the same.
2012-02-24 14:07:58 -05: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
Lirusaito
b555e02220 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-02-23 16:27:46 -05: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
Siana Gearz
a632010b95 Boost: target Windows XP strictly 2012-02-23 15:35:50 +01:00
Siana Gearz
a1038f3972 Merge git://github.com/LightDrake/SingularityViewer 2012-02-23 03:06:19 +01:00
Siana Gearz
93f6ea1a07 Pure linden boost on windows 2012-02-23 03:05:31 +01:00
Siana Gearz
d721fd65b3 Bugfix repackager 2012-02-23 03:03:15 +01:00
Siana Gearz
e207f2e025 Fix scroll buttons on dark skin 2012-02-23 02:29:59 +01:00
Lirusaito
507c94c24c Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-02-22 17:20:21 -05:00
Siana Gearz
be37d9b5a9 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-02-22 18:02:04 +01:00
Siana Gearz
e39327c017 Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer 2012-02-22 18:01:45 +01:00
Lirusaito
2699fa8cf9 Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2012-02-22 11:23:59 -05:00
Lirusaito
513002416c Corrected text to say viewer's website, since we are not Imprudence. 2012-02-22 09:50:19 -05:00
Lirusaito
22530cd77e Prevent snapshot resolution from going over window size, when showing UI or HUD in snapshots is enabled.
Otherwise snapshots do not have UI/HUD shown, despite enabling RenderUIInSnapshot or RenderHUDInSnapshot.
2012-02-22 09:23:09 -05:00
Lirusaito
81521b98fd Added gesture_muted icon, reworked the panel_audio to look better, and have mute gesture look more like the rest of the panel. 2012-02-22 06:22:05 -05:00
Drake Arconis
edbc22961e Revert "Further OS X changes."
This reverts commit 803011582c.
2012-02-22 05:49:38 -05:00
Lirusaito
73c2feee97 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-02-21 16:46:22 -05:00
Drake Arconis
3250725aae Annoying Crash Fix.
This fixes that thing where saving scripts in deleted object makes
viewer go FFFFFF.
2012-02-21 10:56:27 -05:00
Drake Arconis
803011582c Further OS X changes. 2012-02-21 10:53:47 -05:00
Aleric Inglewood
2206f68129 Fix webkit on Ubuntu
WARNING("Plugin"): LLPluginInstance::load: apr_dso_load of
*/viewer-linux-i686-releasesse2/newview/packaged/bin/llplugin/libmedia_plugin_webkit.so
failed with error 20019 , additional info string:
*/viewer-linux-i686-releasesse2/newview/packaged/bin/llplugin/libmedia_plugin_webkit.so:
undefined symbol: XSyncIntsToValue

Apparently our webkit package is underlinked, it doesn't
include libXext which is needed for symbol XSyncIntsToValue.
Both, Fritigern and Inusaito had this problem on Ubuntu.
This patch adds the library to the webkit plugin as a work-
around.
2012-02-21 15:52:57 +01:00
Drake Arconis
6388324552 Revert "This works for now. Need to do more testing."
This reverts commit c6d6eed7d3.
2012-02-21 09:27:10 -05:00
Lirusaito
d4212d390d Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer 2012-02-20 17:27:52 -05:00
Lirusaito
2b8a55f396 Add DisableCameraConstraints to the "Camera Options:" checkboxes on Input & Camera Preferences(panel_preferences_input.xml) 2012-02-20 17:13:35 -05:00
TighMacFanatic
89f35779b4 Fixed Windlight presets not loading user created files. 2012-02-20 16:37:34 -05:00
Lirusaito
f253da09ec Added gesture muting feature, like phoenix has. 2012-02-20 16:02:56 -05:00
Drake Arconis
ad1e3f1d2d Merge remote-tracking branch 'upstream/master' 2012-02-20 07:19:35 -05:00
Lirusaito
e232abdab2 Merge branch 'master' of git://github.com/siana/SingularityViewer
Conflicts:
	indra/newview/skins/dark/colors_base.xml
	indra/newview/skins/gemini/colors_base.xml
	indra/newview/skins/pslgreen/colors_base.xml
	indra/newview/skins/pslpurple/colors_base.xml
	indra/newview/skins/sapphire/colors_base.xml
2012-02-20 00:01:04 -05:00
Siana Gearz
9477a5f32f Fix code bug making notifications unreadable colour 2012-02-20 05:38:57 +01:00
Siana Gearz
8e71cf8e6e Revert "Replace all NotifyCautionBoxColor's and AlertCautionBoxColor's that were using tan with black, like Emerald skin's NotifyCautionBoxColor."
This reverts commit 0fef1407e3.
2012-02-20 05:05:57 +01:00
Siana Gearz
ea7396d2cf Crashfix audio panel in skin 2012-02-20 05:05:53 +01:00
Siana Gearz
5c7debecc8 Extra info from j2c decoder in case of cache corruption 2012-02-20 03:47:06 +01:00
Lirusaito
fae40e0bdf Fix to "Replace all NotifyCautionBoxColor's and AlertCautionBoxColor's that were using tan with black"(0fef1407e3), to only apply to skins where the tan background was too similar to the font color.
Also, for skins now using this black background, adjust foreground color to show up and match the skin, in cases where it was black.
2012-02-19 19:58:34 -05:00
Drake Arconis
c6d6eed7d3 This works for now. Need to do more testing. 2012-02-19 19:43:53 -05:00
Aleric Inglewood
39f8deb498 Merge remote-tracking branch 'siana/master' 2012-02-19 23:54:59 +01:00
Drake Arconis
665569dfc7 I forgot why I made these. 2012-02-19 17:07:42 -05:00
Drake Arconis
19f72cf967 Merge remote-tracking branch 'upstream/master' 2012-02-19 16:16:34 -05:00