Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,919 Commits 20 Branches 51 Tags
bd8a44ad210ab42e2124cb597725e4e27bc1ea48
Commit Graph

4919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Latif Khalifa
891417d0a5 Merge remote-tracking branch 'lirusaito/master' 2013-04-24 04:56:05 +02:00
Lirusaito
b60ee67b0c Make GCC 4.8 a little happier by removing a copy pasted pointless line 2013-04-23 22:14:56 -04:00
Melanie
9cd9fcdfbe Allow the export check box to show for rezzed objects in opensim - fixes a copypasta error 2013-04-24 02:47:07 +02:00
Aleric Inglewood
dc5e94812c Inline accessors of HippoGridInfo. 2013-04-23 21:50:51 +02:00
Aleric Inglewood
bbee0bfdd5 Add -Wno-sign-compare back. 2013-04-23 21:37:22 +02:00
Aleric Inglewood
27549584aa Merge remote-tracking branch 'singu/master' 2013-04-23 19:41:11 +02:00
Aleric Inglewood
96d8380099 Remove -Wno-sign-compare and fix DISABLE_FATAL_WARNINGS 
Turn on sign-compare warnings and allow fatal warnings when
using -DDISABLE_FATAL_WARNINGS:BOOL=OFF during configuration.
The default is no -Werror.
 2013-04-23 19:37:53 +02:00
Lirusaito
c7a9bd0f4f Translation updates 2013-04-23 09:23:23 -04:00
Latif Khalifa
1f58d1250f Merge remote-tracking branch 'lirusaito/master' 2013-04-23 12:57:33 +02:00
Latif Khalifa
f1ce3c89c3 Silence warnings 2013-04-23 12:57:02 +02:00
Latif Khalifa
a5bb6114b7 Merge remote-tracking branch 'siana/master' 2013-04-23 12:19:09 +02:00
Latif Khalifa
e0077b6941 Merge remote-tracking branch 'lirusaito/master' 
Conflicts:
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
	indra/newview/skins/default/xui/fr/panel_preferences_general.xml
 2013-04-23 12:17:08 +02:00
Latif Khalifa
5396d17f2a Merge remote-tracking branch 'aleric/master' 
Conflicts:
	indra/newview/lltexturefetch.cpp
	indra/newview/llviewerwindow.cpp
 2013-04-23 12:13:54 +02:00
Siana Gearz
d6d5d5ae1b Bring back memory stat! Someone is a clobbermonster. 2013-04-23 11:46:44 +02:00
Lirusaito
24f08f7b0c Linux64 should be mentioned in the usage of repackage.sh 2013-04-23 04:47:48 -04:00
Melanie
ca95c68af5 A fix to the octopus - use dialog channel for value replies 2013-04-23 04:58:28 +02:00
Melanie
274c51c536 Serverside outfits, part tow - final - call a CAP if outfit is changed successfully 2013-04-23 04:52:51 +02:00
Melanie
6addfdfd93 Small bug fix - this could never work 2013-04-23 03:23:14 +02:00
Melanie
72db1a02b7 Fix audio the proper way 2013-04-23 03:16:31 +02:00
Melanie
ba6b2ef865 Revert "Add the new audio init code (experimental)" 
This reverts commit 1bc887f887.
 2013-04-23 03:15:59 +02:00
Melanie
df16ef39c5 Merge branch 'master' into Avination-4.0 2013-04-22 23:47:57 +02:00
Melanie
6296b5157b Limit the number of texture fetchers to two for Avination as this gives a better user experience (less timeouts) with AVN server side throttling. 2013-04-22 23:47:41 +02:00
Melanie
a4032e5e70 Add the option to dynamically enable/disable controls to the octopus 2013-04-22 23:47:34 +02:00
Melanie
7923323031 Limit the number of texture fetchers to two for Avination as this gives a better user experience (less timeouts) with AVN server side throttling. 2013-04-22 23:46:28 +02:00
Melanie
1934e49f99 Add the option to dynamically enable/disable controls to the octopus 2013-04-22 23:45:56 +02:00
Melanie
1b15b5bf5d Stage one of the new "change clothing" function. Introcuce an easy way to add generic packet handlers. 2013-04-22 15:02:23 +02:00
Melanie
1bc887f887 Add the new audio init code (experimental) 2013-04-21 05:55:47 +02:00
Melanie
cfe5236263 Remove info spam for empty event queue response - those can happen on opensim and we don't really need to know. 2013-04-21 05:55:15 +02:00
Lirusaito
bfb6e852a2 Added the serverside notifications that are localized now. 
One snuck up on me, so I figured I'd add the bunch. Left out some at the end that looked like CHUI.
 2013-04-20 22:09:50 -04:00
Melanie
fa5dba63dc Merge branch 'master' into Avination-4.0 2013-04-21 03:35:54 +02:00
Melanie
c216e75d23 Fix a duplicate element name (copypasta error) 2013-04-21 03:31:38 +02:00
Melanie
3f6e0580af Disable HTTP throttling for Avination as it's done serverside there 2013-04-21 03:31:29 +02:00
Melanie
fb781ab8f2 Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-04-21 03:31:16 +02:00
Melanie
c38eb88915 Disable HTTP throttling for Avination as it's done serverside there 2013-04-21 03:30:27 +02:00
Melanie
43179bf853 Fix a duplicate element name (copypasta error) 2013-04-20 20:27:41 +02:00
Siana Gearz
e484904e3b Version 1.8.0 1.8.0 2013-04-20 14:44:01 +02:00
Siana Gearz
24047c933a No longer stall to death on unreadable streams 2013-04-20 13:27:32 +02:00
Latif Khalifa
41fba80cb5 More french translation updates 2013-04-20 08:51:15 +02:00
Melanie
11ba4d0d7d Merge branch 'master' into Avination-4.0 2013-04-20 08:08:53 +02:00
Melanie
3075429bca Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-04-20 08:08:40 +02:00
Latif Khalifa
abc60bb235 Merge remote-tracking branch 'shyotl/master' 2013-04-20 08:06:04 +02:00
Shyotl
c9f93a82ce Improved the logic in LLPipeline::updateDrawableGeom a bit. 2013-04-20 01:02:40 -05:00
Shyotl
39c4d9ad50 Merge branch 'master' of git@github.com:singularity-viewer/SingularityViewer.git 2013-04-20 01:01:26 -05:00
Shyotl
2121e78b45 Lessen occurrence of missing prims. Also added 'ctrl-shift-v' to rebuild vbos. 2013-04-20 01:00:24 -05:00
Melanie
37f3695e78 Merge branch 'master' into Avination-4.0 2013-04-20 06:40:51 +02:00
Melanie
1849b5ba1e Add isAvination() function to hippo grid manager 2013-04-20 06:40:16 +02:00
Latif Khalifa
2580aad939 Re-apply saphira's Linux build patch that somehow got lost in merges 2013-04-20 05:26:47 +02:00
Aleric Inglewood
0b86c9eec1 Merge remote-tracking branch 'singu/master' 
Conflicts:
	indra/newview/llviewerwindow.cpp

c_str() dropped out (50f03d83c0).
Added it back.
 2013-04-20 05:18:27 +02:00
Aleric Inglewood
368d675f24 Compile warning fix. 2013-04-20 05:07:44 +02:00
Aleric Inglewood
e12aaa3f5f Compile warning fix. 2013-04-20 05:06:30 +02:00