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

34 Commits

Author SHA1 Message Date
Aleric Inglewood
1254a7bbe2 Merge remote-tracking branch 'github/master' into curlthreading3 
Conflicts:
	indra/aistatemachine/aistatemachine.cpp
 2012-09-22 01:25:54 +02:00
Siana Gearz
b7f5d7e415 Windows build fixes 2012-09-20 01:37:40 +02:00
Aleric Inglewood
131959e388 Merge branch 'curlthreading2' into curlthreading3 2012-09-11 15:19:28 +02:00
Shyotl
118937aa99 Fow windows, client is now more likeley to create gl context that actually matches desired multi-sample value. 2012-09-02 08:49:46 +02:00
Aleric Inglewood
536cb6febd Merge branch 'curlthreading2' into curlthreading3 
Conflicts:
	indra/CMakeLists.txt
	indra/llcommon/llstring.h
	indra/llmessage/CMakeLists.txt
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp
 2012-08-15 00:51:40 +02:00
Aleric Inglewood
3b7887a041 Cleanup of some unnecessary dependencies. 2012-07-29 01:30:11 +02:00
Drake Arconis
ccb914ea83 General cleanup of OSX support - not done 
Updated with new cursors from LL
Corrected mispackaged OSX Libs
Corrected mouse flicker on menus

Signed-off-by: Drake Arconis <lightdrake@gmail.com>
 2012-07-15 17:45:50 -04:00
Drake Arconis
7af331c50d First set of changes for new librarys and lib layout support! 
Modified repackage script to support new layout
Fixed webkit to work against new llqtwebkit
 2012-07-04 00:26:42 +00:00
Lirusaito
fd59accf96 Correct path to launch_url.sh 
Makes Open in External browser work in Linux (and Solaris, hypothetically.)
Nothing lives in etc/ of packaged, let's keep it that way.
 2012-06-10 09:09:27 -04:00
Lirusaito
7b2c4034f1 Fix for STORM-1854: Linux Viewer crashes on startup after update to Fontconfig 2.9.0 
Thanks to Johnnie Carling
https://jira.secondlife.com/browse/STORM-1854?focusedCommentId=325106&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-325106
 2012-05-23 16:46:53 -04:00
Shyotl
ae0804beea Trival V3 llmath merge. 2012-05-21 20:23:42 -05: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
Siana Gearz
8334277838 Want ridiculously small viewer window? Here you go. 2012-03-22 06:03:05 +01:00
Siana Gearz
b67fa864ff First shot at fixing font fallback 2012-03-05 18:18:37 +01:00
Shyotl
a6a69caa4f Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp
 2012-02-24 13:21:59 -06:00
Shyotl
3d39e443fe Append username to window title upon connecting to grid. 2012-02-22 17:51:06 -06:00
Siana Gearz
b91ba258e1 Make double click more humane on X11 2012-02-15 14:45:09 +01:00
Siana Gearz
d385de9139 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llstartup.cpp
	indra/newview/llviewerregion.cpp
 2012-01-24 21:22:49 +01:00
Shyotl
6374f012de new fasttimers, including ui. 2012-01-23 18:30:54 -06:00
Siana Gearz
419f7b41af Global lineending fixup 2012-01-14 05:42:53 +01:00
Shyotl
e847b105f2 CURRENCY added as a default token replacement within LLTrans. (Will be useful when strings are migrated from ui xmls to strings.xml). Also, fixed compile (missed llwindowcallbacks.cpp in my previous commit) 2012-01-09 16:54:13 -06:00
Shyotl
e9bd6a3b0d Better translation support relating to client initialization/login. 2012-01-09 01:40:30 -06:00
Shyotl
ffb285c6ff Huge renderer update (WIP). Still plenty to do, especially pertaining to UI. 
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
 2011-12-09 14:02:29 -06:00
Shyotl
18e5b94615 Shouldn't need this glFinish as SwapBuffers does the same thing. 2011-10-17 12:12:47 -05:00
Shyotl
008bebd817 Merge with siana/future 2011-10-13 00:03:56 -05:00
Shyotl
baddb47c44 LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now. 2011-08-29 03:44:17 -05:00
Aleric Inglewood
6848c2df6f Fix underlinkage of libmedia_plugin_webkit.so 
Fixed by updating indra/cmake/WebKitLibPlugin.cmake with
version from imprudence.

This commit also contains removal of execute permissions
of source files and configure files, sorry...
 2011-05-02 23:13:15 +02:00
Shyotl
c694d12c93 Bringing in-line with V2. mbstowcs->MultiByteToWideChar, ancient comment removal, fullscreen behavior check... 2011-04-23 01:01:55 -05:00
Siana Gearz
77fc0e82c8 Linux version 2011-01-04 02:00:25 +01:00
siana
aff58d0ab9 Unbroke Windows build (vc9 compat only) 2010-12-19 03:35:24 +01:00
Siana Gearz
d68736da39 Put in some changes along sg1.4 dev history. 2010-11-21 15:57:44 +01:00
CharleyLevenque
794a5ce848 Fixed the History and Teleport panels in Instant Messages. 2010-08-22 22:22:24 -04:00
Hazim Gazov
1d67001d25 added code for disabling clouds 2010-04-18 22:46:40 -03:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00