Latif Khalifa
|
53c7cf116c
|
Implement setting home position the way V3 does it, with CAP fallback
|
2012-08-16 08:00:42 +02:00 |
|
Siana Gearz
|
95b7842e31
|
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
|
2012-08-16 03:46:32 +02:00 |
|
Siana Gearz
|
0b953ccc40
|
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
|
2012-08-16 03:37:50 +02:00 |
|
Siana Gearz
|
41c4eabcaa
|
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
|
2012-08-16 03:37:34 +02:00 |
|
Siana Gearz
|
0a33a3a71a
|
This should at least stop crash from pathfinding notification till we have figured it out better.
|
2012-08-16 03:37:13 +02:00 |
|
Shyotl
|
d6b470cd07
|
Just call LLPipeline::refreshCachedSettings() in LLViewerShaderManager::setShaders() to avoid occlusion-related crashes if certain shaders failed to load.
|
2012-08-15 16:21:10 -05:00 |
|
Lirusaito
|
d1cb627582
|
What started out as removing the newline spam in LLPanelObject, ended as cleanup/sync with v-d.
Jus' want files to be nice to read, but then... a bunch of them are all messy.. so... Fixed~
|
2012-08-15 10:00:47 -04:00 |
|
Lirusaito
|
1d99158562
|
newview/CMakeLists.txt alphabetized and brought closer to v-d.
Yay cleaning~
|
2012-08-15 02:10:10 -04:00 |
|
Lirusaito
|
bb9e260793
|
LLViewerMenuFile, missed a spot with translation.
Also rearranged includes, for better sync with upstream v-d...
|
2012-08-14 19:47:39 -04:00 |
|
Latif Khalifa
|
258fe8bad0
|
Fixed region windlight on OpenSim. It's not possible to assume that the mere existance of M7WL should mean override of RegionWindlight as M7WL is always sent. If M7WL is to have a preference some other method must be devised, ie. a debug setting
|
2012-08-14 21:30:25 +02:00 |
|
Latif Khalifa
|
74772a1f61
|
One should never invoke CAPs request without checking if the capability is present. Fixes setting home location on OSGrid, issue #426
|
2012-08-14 19:30:49 +02:00 |
|
Siana Gearz
|
bdaa5f20a1
|
Auto detach Firestorm bridge
|
2012-08-14 08:11:15 +02:00 |
|
Siana Gearz
|
6265027222
|
Commonly requested resolutions for HD monitors
Totally wish i had that last one! Wheeee, SPAAAACE!
|
2012-08-14 00:35:53 +02:00 |
|
Siana Gearz
|
507c5eb7ca
|
Fix classified search
|
2012-08-13 21:50:09 +02:00 |
|
Siana Gearz
|
6b8c58e3b5
|
Safe and probably pointless crash workarounds from FS and LL
|
2012-08-13 06:14:16 +02:00 |
|
Lirusaito
|
67f4797e09
|
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
|
2012-08-12 22:58:22 -04:00 |
|
Siana Gearz
|
7335ae548c
|
Add script teleport permission
|
2012-08-13 03:04:33 +02:00 |
|
Siana Gearz
|
0b1a5bc3c1
|
Translation file clean-up
|
2012-08-13 02:23:08 +02:00 |
|
Siana Gearz
|
e9c54bb5e4
|
Fix voice icon in chat floater tab
|
2012-08-13 01:56:35 +02:00 |
|
Siana Gearz
|
4294038271
|
Potential HTTP fixes from viewer-http
|
2012-08-12 22:39:33 +02:00 |
|
Lirusaito
|
408eab13f0
|
Removed a duplicate string
|
2012-08-12 16:04:22 -04:00 |
|
Siana Gearz
|
ee0bd9ee76
|
De-uglify graphics preferences
|
2012-08-12 20:52:57 +02:00 |
|
Siana Gearz
|
039f665af1
|
Hopefully fix FMOD Ex packaging this time
|
2012-08-12 16:38:25 +02:00 |
|
Siana Gearz
|
89ad14b82f
|
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
|
2012-08-12 14:52:47 +02:00 |
|
Siana Gearz
|
73785af730
|
Fix permission panel unclickable
|
2012-08-12 13:33:27 +02:00 |
|
Siana Gearz
|
d2c3e50a3f
|
Fix LLTrans for Unknown
|
2012-08-12 13:15:42 +02:00 |
|
Siana Gearz
|
4f57269518
|
Fix show muted text in chat
|
2012-08-11 22:26:31 +02:00 |
|
Lirusaito
|
92c9311a4c
|
gpu_table update!
|
2012-08-11 02:51:49 -04:00 |
|
Lirusaito
|
ca6fd89700
|
Initial gpu_table retabbing, nothing important.
|
2012-08-11 01:49:15 -04:00 |
|
Lirusaito
|
80b100f135
|
Fix "KeyError: 'extra_libraries'" when compiling without FMOD Ex.
|
2012-08-11 00:48:36 -04:00 |
|
Lirusaito
|
8e12f11089
|
Forgot to commit this include
|
2012-08-11 00:09:09 -04:00 |
|
Lirusaito
|
f4324e8890
|
Merge branch 'future' of git://github.com/Lirusaito/SingularityViewer
Conflicts:
indra/llrender/llpostprocess.cpp
|
2012-08-10 23:39:06 -04:00 |
|
Lirusaito
|
fda34fea46
|
Merge branch 'AltCompilers' of https://github.com/LightDrake/SingularityViewer
|
2012-08-10 23:30:56 -04:00 |
|
Lirusaito
|
0770150455
|
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
|
2012-08-10 23:30:16 -04:00 |
|
Lirusaito
|
d79a8fc87b
|
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
|
2012-08-10 23:27:42 -04:00 |
|
Lirusaito
|
486536f92d
|
Allow antispam time to be set to 0, for disabling Antispam.
|
2012-08-10 18:41:50 -04:00 |
|
Drake Arconis
|
0be43cf1c2
|
Fixed GCC47 issues and fmodex copying
|
2012-08-09 10:56:29 -04:00 |
|
Siana Gearz
|
f5923860fa
|
Remove maximum selection limit of 20 friends, no longer present in viewer 2/3
|
2012-08-09 15:39:22 +02:00 |
|
Siana Gearz
|
adc2921f38
|
Fix push to talk lock
|
2012-08-09 15:28:04 +02:00 |
|
Siana Gearz
|
ca630a106e
|
Merge fix
|
2012-08-09 15:21:38 +02:00 |
|
Drake Arconis
|
cbbc42d564
|
Merge remote-tracking branch 'singularity/master' into AltCompilers
|
2012-08-09 08:44:14 -04:00 |
|
Siana Gearz
|
e616b40c6f
|
Autodetect music stream type properly
|
2012-08-09 05:09:02 +02:00 |
|
Siana Gearz
|
26109ca8f9
|
Assert fix
|
2012-08-09 04:50:48 +02:00 |
|
Siana Gearz
|
46e57d4f1c
|
Package FMOD Ex on Linux
|
2012-08-09 03:46:24 +02:00 |
|
Siana Gearz
|
7743843a27
|
Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer
Conflicts:
indra/newview/skins/default/xui/en-us/strings.xml
|
2012-08-09 03:46:03 +02:00 |
|
Siana Gearz
|
c84e145557
|
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
Conflicts:
indra/llrender/llrendertarget.cpp
indra/newview/lloverlaybar.cpp
|
2012-08-09 02:11:14 +02:00 |
|
Drake Arconis
|
e767392b44
|
Merge remote-tracking branch 'shyotl/future' into AltCompilers
Conflicts:
indra/llrender/llrendertarget.cpp
indra/newview/llvovolume.cpp
|
2012-08-08 18:54:04 -04:00 |
|
Drake Arconis
|
457177905d
|
Merge remote-tracking branch 'singularity/master' into AltCompilers
|
2012-08-08 18:50:03 -04:00 |
|
Siana Gearz
|
de74443d76
|
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
Conflicts:
indra/newview/llvovolume.cpp
indra/newview/skins/default/xui/fr/panel_overlaybar.xml
|
2012-08-09 00:42:23 +02:00 |
|
Siana Gearz
|
f3e7340118
|
Merge branch 'shycurl' of github.com:singularity-viewer/SingularityViewer
Conflicts:
indra/llmessage/llhttpclient.cpp
indra/llmessage/llhttpclient.h
indra/llmessage/llurlrequest.cpp
indra/llmessage/llurlrequest.h
|
2012-08-09 00:02:50 +02:00 |
|