Commit Graph

635 Commits

Author SHA1 Message Date
Siana Gearz
d68736da39 Put in some changes along sg1.4 dev history. 2010-11-21 15:57:44 +01:00
Siana Gearz
6866a36a5c Display names from Phoenix. Thanks Wolfspirit!
That's quite a piece of work. I have NO idea how Jess can downplay the
effort that went into this.

And it's still not complete, local chat is not affected, perhaps group
chat too.
2010-11-20 15:25:57 +01:00
Siana Gearz
a80470865f Merge remote branch 'shyotlsv/master' 2010-11-19 23:36:25 +01:00
Siana Gearz
c21d066454 Auto deruth, backport from 2.x 2010-11-19 12:41:08 +01:00
Siana Gearz
5c4c165204 Shift Enter whispers 2010-11-19 02:08:02 +01:00
Shyotl
8289b2c1c6 Imprudence patch dragged in some regression. 2010-11-18 18:53:49 -06:00
Siana Gearz
85e26c05d1 Crashfix texture viewer, update 2010-11-19 01:53:15 +01:00
Siana Gearz
7103114006 Merge remote branch 'shyotlsv/master' 2010-11-18 23:56:07 +01:00
Siana Gearz
7f61885ba5 Merge remote branch 'shyotl/master' 2010-11-18 23:53:59 +01:00
Siana Gearz
c73e2713b5 Borrowed j2c bridge from Impru. THANKIES <3 2010-11-18 23:53:34 +01:00
Siana Gearz
923c18bc0a Moar Thickbrick! 2010-11-18 22:43:00 +01:00
Siana Gearz
e9296374cf Revert "HTTP GET fix, bisected from Techwolf's patches. Thanks :)"
This reverts commit 29584c7a28.
2010-11-18 20:22:20 +01:00
Siana Gearz
d5fee73c42 Thickbrick's fixes 2010-11-18 20:22:11 +01:00
Shyotl
340ad7f4b8 Fixed cmake errors preventing generation of windows solution
-Resolved merge errors in cmake CopyWinLibs.cmake
-Added CMAKE_C_FLAGS_RELEASESSE2 for windows target. Required for llimage in Singularity
2010-11-17 20:47:12 -06:00
unknown
3cbec60562 Played with trees!
-Fixed pine2 'billboard' being crazy large compared to the mesh version
-Fixed vanishing trees under certain scenarios
-Made LoD less retardedly sensitive when RenderAnimateTrees=true
-Moar LLCachedControl
2010-11-17 03:51:58 -06:00
Siana Gearz
c1c2f65b12 Integrated OpenJPEG 1.4 2010-11-17 02:39:27 +01:00
Siana Gearz
b426c3874f Streamlined writes to bus external memory 2010-11-16 16:46:53 +01:00
Siana Gearz
e1c7378bdf Early culling pt1 2010-11-16 01:00:00 +01:00
Siana Gearz
44a98a80b4 Setting crashfix 2010-11-16 00:59:28 +01:00
Siana Gearz
a6f6325d37 Deferred instantiation and lazy avatar updates...
Are a can of worms. This will haunt me for a while i think.
2010-11-16 00:43:44 +01:00
Siana Gearz
f2d43d5239 Settings, UI fix 2010-11-15 11:46:00 +01:00
Siana Gearz
e6806f3b16 Branding pt2 2010-11-15 10:45:16 +01:00
Siana Gearz
8a2915d07c Shymod/RLVa merge whoopsie 2010-11-15 01:42:38 +01:00
Siana Gearz
6a7c9250fd Branding pt1 2010-11-14 17:28:44 +01:00
Siana Gearz
d320fe9e92 Skinjob 2010-11-14 14:55:16 +01:00
Siana Gearz
1c37fa0fce Cache purge queue 2010-11-13 05:39:09 +01:00
Siana Gearz
dcb1155033 Idle update perf fix 2010-11-13 05:27:02 +01:00
Siana Gearz
9dffb18c25 ld.gold on linux, useless spam 2010-11-13 04:45:10 +01:00
Siana Gearz
e87975b8eb Fixing media, second part 2010-11-12 00:02:37 +01:00
Siana Gearz
93ae868684 More graphic card presets 2010-11-11 22:35:57 +01:00
Siana Gearz
c06db583a2 Henry's Media Fixes 2010-11-11 22:00:01 +01:00
Siana Gearz
5a49ceab6d Merge Shyotl 2010-11-11 21:54:47 +01:00
Siana Gearz
29584c7a28 HTTP GET fix, bisected from Techwolf's patches. Thanks :) 2010-11-11 14:53:50 +01:00
unknown
3604f98734 Forgot something, apparently!
Also, Boolean + Real = bad.
2010-11-11 00:26:17 -06:00
unknown
31cf29f51f Dear GCC:
:(

Sincerely,
Shyotl
2010-11-10 19:52:14 -06:00
Siana Gearz
17a0d13b0c Merge shyotl, setting include broken (disabled) 2010-11-09 15:14:34 +01:00
Siana Gearz
8d6ce154fd Settings 2010-11-08 23:23:28 +01:00
Siana Gearz
d7a1575ad2 Merged Ascent progress - title picker 2010-11-08 22:59:46 +01:00
Siana Gearz
21e10551b3 More fixes after RLVa plonk 2010-11-07 21:33:31 +01:00
Siana Gearz
18149fdfed RLVa fixes 2010-11-07 18:52:25 +01:00
Siana Gearz
740b570168 Merged in RLVa. Viewer broken! 2010-11-07 05:05:47 +01:00
Siana Gearz
ae4a9521af Linden walk motion slower 2010-11-06 20:13:38 +01:00
Siana Gearz
9cb3da23ea Skin packaging fix 2010-11-05 16:30:48 +01:00
Beeks
4763ee7424 z.z
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-26 23:10:30 -04:00
Beeks
7eca5b9fcc Merge branch 'master' of github.com:Beeks/Ascent
Conflicts:
	indra/newview/skins/default/xui/en-us/panel_friends.xml
2010-10-26 23:08:41 -04:00
Beeks
d3cb5edf2c HonK hOnk hoNK
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-26 23:05:08 -04:00
Beeks
55343314e1 ffffffffffub
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-26 23:04:04 -04:00
Beeks
b23d7f174c Forced to push completely broken Contact Groups because a comment was removed from ascentflowercontactgroups.cpp and was committed.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-26 23:01:51 -04:00
Beeks
395100fef6 Henri's Group Title picker.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-26 22:48:00 -04:00
CharleyLevenque
38374d3876 RP mode for IMs. Versioning. Dickdongs. 2010-10-24 01:14:00 -04:00