Commit Graph

19 Commits

Author SHA1 Message Date
Siana Gearz
b34d9fb88e MultiAttach unbork attempt 2011-04-01 05:13:39 +02:00
Siana Gearz
4b4096857f Merge commit 'a028c4edba8a5ddb340afc8eebb56b06b363bab1' 2011-04-01 05:13:12 +02:00
Siana Gearz
b4237a8200 HUD of DEATH fix 2011-03-28 02:28:07 +02:00
Shyotl
8323a701e8 Fixed some 'RenderDelayCreation' related crashes 2011-03-27 16:53:17 -05:00
siana
15c01ed310 Merge remote branch 'shyotl/V2Renderer'
Conflicts:
	indra/cmake/00-Common.cmake
2011-03-20 04:55:56 +01:00
Siana Gearz
919d321d4a MultiAttach only on SL 2011-03-16 13:44:12 +01:00
Shyotl
996aaf6345 V2 spatial partition, and all the pipeline changes that go with it.
Note: Deferred mode is not finished, and thus broken. Don't use!
2011-03-10 23:05:04 -06:00
Shyotl
291de90276 V2 llprimitive merge 2011-02-23 01:44:31 -06:00
Siana Gearz
cbb22d7d12 AR picking fix unbroken.
Should be less intrusive now, leak less memory, and perhaps fix a few
other instances where Phoenix and Singularity wouldn't behave like
Snowglobe.
2011-01-07 23:26:24 +01:00
Siana Gearz
16b6ebf7de Reliable picking of objects in AR floater.
Backport from 2.4 - removes a check of whether picker really expects to
receive properties for an object, which fails when you pick a non-root
prim. From source inspection, shouldn't really affect anything else
adversely.
2011-01-07 00:09:06 +01:00
Siana Gearz
f9dcb1bb09 RLVa 1.1.2 to 1.1.3 upgrade. InvLinks + COF 2010-11-25 23:47:11 +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
5a67fcd623 Revert "THE BIGGIE."
This reverts commit ec55705bdd.

Conflicts:

	indra/newview/ascentprefsvan.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
2010-10-18 18:27:09 +02:00
Beeks
ec55705bdd THE BIGGIE.
Holy hell, this was an interesting one to implement. I wish I understood it better. Unfortunately I think this marks the end of trying to re-implement the Local Inventory for Temp and Local textures. It's just not feasible now that the entire inventory system has been whipped into a code shitstorm.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-22 06:48:48 -04:00
Beeks
5ce4286fd7 f 2010-08-22 15:14:30 -04:00
Hazim Gazov
9a7e50fe2e just adding what I have for now 2010-05-03 10:04:31 -03:00
Hazim Gazov
f0ba217dbe start pushing in exporting crap 2010-05-01 07:20:27 -03:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00