Commit Graph

9 Commits

Author SHA1 Message Date
TighMacFanatic
ff786ad2c7 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future 2011-10-13 18:16:40 -04:00
Shyotl
7bbbfd9a9b Added avatar visibility and sound settings to 'About Land' floater. 2011-10-13 03:22:50 -05:00
Shyotl
008bebd817 Merge with siana/future 2011-10-13 00:03:56 -05:00
Siana Gearz
df7f37d0eb Add a bunch of fixes to the world and minimap so that teleports inside a var work and the map looks semi-correct.
Conflicts:

	indra/newview/app_settings/message_template.msg
2011-10-06 03:56:05 +02:00
Siana Gearz
174a33beb3 Variable size region support, by RevolutionSmythe 2011-08-04 22:20:25 +02: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
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
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00