Shyotl
cf6668cb7a
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-05-20 12:38:36 -05:00
Siana Gearz
1327c80dd7
Don't assume we have perftools
2011-05-18 15:41:14 +02:00
Shyotl
1a2d75fbe6
LLStringOps, LLStringUtilBase, and LLDate updated to V2. If dates go wonky this is where it's from
2011-05-15 22:50:56 -05:00
Shyotl
fe372028dc
Shuffled LL_COMMON_API around in spots to match v2
...
Added llformat_to_utf8
Added LLProcessLauncher::getExecutable()
LLStringTableEntry() ctor and dtor definitions moved from .h to .cpp
(should be safe)
2011-05-15 22:47:23 -05:00
Shyotl
51338470b5
Pulled LLEventTimer out of lltimer.h/cpp and into lleventtimer.h/cpp
...
LLInstanceTracker added to llcommon (pulled from llui in v2 for usage elsewhere)
LLEventTimer now using LLInstanceTracker
Updated LLLiveAppConfig (Though it appears unused, really)
processor.h is obsolete, thus removed. (llprocessor.h replaces it)
2011-05-15 22:40:59 -05:00
Shyotl
e3435d7ef9
Slight llcharacter updates from v2 (should be safe)
2011-05-15 22:22:22 -05:00
Shyotl
37c5016c2f
LLAssetType lookup now done through LLDictionary.
2011-05-15 22:17:15 -05:00
Siana Gearz
742ecf395f
One last GCC 4.6 stopgap
2011-05-16 02:12:46 +02:00
Siana Gearz
adeba18356
GCC 4.6 fixes
2011-05-16 01:37:00 +02:00
Siana Gearz
3abc778f2c
Empty splash page workaround
2011-05-15 20:19:26 +02:00
Siana Gearz
bd153fc68f
Public Thread Safety notice:
...
<add a cheesy cooment here>
2011-05-15 14:24:15 +02:00
Shyotl
4e47446be1
LLVOAvatar class members reorganized to line up with V2 better. Added accessors from v2 where applicable. mBakedTextureData renamed to mBakedTextureDatas
2011-05-14 12:38:47 -05:00
Siana Gearz
32594cd651
Version 1.5.8(1)
2011-05-14 03:27:08 +02:00
Siana Gearz
8df737b488
Not pretty, but i damn know this escaper works
2011-05-14 00:38:43 +02:00
Siana Gearz
ea31271ac1
Version 1.5.8
2011-05-13 20:27:34 +02:00
Siana Gearz
72a502eee4
Make radar readable
2011-05-13 15:13:07 +02:00
Siana Gearz
5aa145cc02
Merge git://github.com/narv/SingularityViewer
2011-05-13 13:26:33 +02:00
Siana Gearz
def7d1052c
Merge git://github.com/Shyotl/SingularityViewer
2011-05-13 13:21:11 +02:00
Shyotl
a3ac5a43b3
Changed how the enabled state for the deferred checkbox is handled in the graphics floater
...
It now is disabled if:
-Lacking hardware support for FBOs
-RenderDeferred not permitted in gpu feature table
-RenderAvatarVP not permitted in gpu feature table
-VertexShaderEnable is enabled and permitted in gpu feature table
-WindLightUseAtmosShaders is enabled and permitted in gpu feature table
Enabling deferred now requires WindLightUseAtmosShaders to be on beforehand, instead of blindly enabling it.
2011-05-13 02:26:14 -05:00
Shyotl
40d813699b
Added Framebuffer Object checkbox to 'Hardware Options' floater.
2011-05-13 02:21:43 -05:00
Shyotl
ccce2a0641
Combox for reflection detail was not initializing to correct selection.
2011-05-13 02:20:50 -05:00
Shyotl
8ac9da7bc8
Disabling buggy old occlusion tweak. Unstable on nVidia.
2011-05-12 19:03:59 -05:00
Shyotl
9cac5233af
Setting the correct variable on Physics LOD setting change sounds like a good idea.
2011-05-13 01:16:20 +02:00
Siana Gearz
0b25aa8ed5
Updated libpng (windows) and ogg/vorbis (all)
2011-05-13 01:01:59 +02:00
Aleric Inglewood
3774547367
Redo the copyconstructor hack for AI*Access objects.
...
The previous hack wasn't thread-safe: read-only access would
access the reference counter multiple times at the same time,
which therefore would have to be thread-local to ever work.
The current solution just disables the calls to lock/unlock
for copyconstructed objects, which works if the copyconstructed
object isn't used anymore after the original is destructed.
This is the case then the copy construction only happens
upon passing a temporary to a function, which is the case.
2011-05-13 00:37:47 +02:00
Shyotl
2c1a46c70d
A stability and leak fix regarding editing physics wearables. Thanks Henri!
2011-05-13 00:36:04 +02:00
Siana Gearz
4d9e7fa8c1
Deferred settings
2011-05-12 22:10:10 +02:00
narv
ebe7053526
Version 1.5.7(2)
2011-05-12 07:50:34 -07:00
narv
981e4f39b2
Revert to build llcommon on Darwin
2011-05-12 07:41:49 -07:00
Siana Gearz
6d5d90bd92
Merge branch 'spamui' of git://github.com/TighMacFanatic/SingularityViewer
2011-05-12 15:16:17 +02:00
narv
636ef25eef
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-05-12 01:24:54 -07:00
TighMacFanatic
f83c10208e
Spam settings UI page
2011-05-12 00:39:06 -04:00
Siana Gearz
50310ba263
Merge git://github.com/Shyotl/SingularityViewer
2011-05-12 00:57:03 +02:00
Siana Gearz
b3847fdeed
Build fixes
2011-05-11 23:06:49 +02:00
Siana Gearz
29feeccf0d
Minimap fluke fix, thx Aleric
2011-05-11 23:06:19 +02:00
Siana Gearz
6b61e2dd2a
Fix linkage in debug build on Windows
2011-05-11 12:47:24 +02:00
Shyotl
b61b0ca932
ShowLookAt now depth-tested
2011-05-10 13:52:59 -05:00
Siana Gearz
b81cfb2c4f
Version 1.5.7(1)
2011-05-10 14:51:27 +02:00
Siana Gearz
eeeb44755a
Make minimap not die on dead objects
2011-05-10 13:50:44 +02:00
Aleric Inglewood
fa51d52578
Workaround for gcc 4.2.x.
...
g++ 4.2 (and possibly earlier) apparently call a copy
constructor when passing a temporary to a function
that takes a const reference. Added code to allow
copy-constructing the AI*Access classes for this
compiler.
g++-4.2.x also bails out when it encounters files that
do not end on a newline. So, also added those where
they were missing.
2011-05-10 13:47:17 +02:00
TighMacFanatic
107c3cb70a
Merge https://github.com/TighMacFanatic/SingularityViewer
...
Conflicts:
indra/newview/CMakeLists.txt
indra/newview/app_settings/settings.xml
2011-05-09 22:06:00 -04:00
Siana Gearz
8227efcaf1
Make our build and packaging shine again
2011-05-09 13:35:51 +02:00
Shyotl
005507c891
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-05-09 00:15:20 -05:00
Siana Gearz
2ca4d1bf64
Merge branch 'AlericMaster' of git://github.com/Shyotl/SingularityViewer
2011-05-09 00:49:21 +02:00
Siana Gearz
e371c2e93d
Repo cleanup. Sheesh, who packaged pics with a lib?
2011-05-09 00:40:38 +02:00
Siana Gearz
8d2b56b1eb
Fixed prebuilt fetching, Snowglobe style
2011-05-08 23:25:21 +02:00
Shyotl
2529644e90
Should now compile on VC100 again.
2011-05-08 16:25:03 -05:00
Shyotl
1a099167ae
Fixing Win compile. (Partial)
2011-05-08 20:34:32 +02:00
Shyotl
0638fafe66
Fixing Win compile. (Partial)
2011-05-08 12:46:42 -05:00
Siana Gearz
e2e576e550
Merge git://github.com/AlericInglewood/SingularityViewer
...
Conflicts:
indra/newview/skins/default/xui/en-us/mime_types.xml
2011-05-08 19:39:32 +02:00