Commit Graph

20 Commits

Author SHA1 Message Date
Lirusaito
c5329968f7 Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer
# Conflicts:
#	indra/llcommon/llstring.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerregion.cpp
2019-03-18 17:30:34 -04:00
Shyotl
2d8fbb89c9 Intermiediary commit. 2019-03-16 17:51:00 -05:00
Lirusaito
049c1e16b0 Aurora-Sim is now WhiteCore
Minor Alchemy merge in removing llvlmanager,
indra_constants no longer has *_LAYER_CODE
2019-01-25 21:21:55 -05:00
Lirusaito
6fcbe9d0de Increase DEFAULT_MAX_AGENT_GROUPS to 60
Also cleans up limits code stuffs and syncs indra_constants a bit.
2016-05-27 09:27:43 -04:00
Inusaito Sayori
72080e79e9 Sync llcommon with Alchemy a bit.
llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.
2015-03-20 22:04:04 -04:00
Latif Khalifa
ad8ea07a7a Aurora var region support
Firestorm patch by Cinders
Adopted from Angstrom viewer with assistance of nhede Core
and Revolution Smythe.
2013-09-27 03:14:51 +02:00
Lirusaito
ffe403e0f0 Update administrative tools code from upstream
Updates LLFloaterTopObjects code to have parcel filter(STAT_FILTER_BY_PARCEL_NAME) and use the CallbackRegistrar
Top Objects XML (and Translation) bits updated in part from Firestorm, as LL Viewer lacks certain buttons and the old xml was too far behind
- Translators may want to have a look at this... although you sorta need to have estate powers for it to be of any worth... *sigh*
Updates LLFloaterGodTools to use CallbackRegistrar
2013-07-13 16:38:20 -04:00
Shyotl
d71210e942 Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory) 2013-01-07 14:44:54 -06:00
Lirusaito
0ad533d94d STORM-1870 and Have a space before old names in parentheses, like V3.
Also small fixes, some spelling, some important; synchronize with upstream a bit..
Jonathan Yap: STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached
2012-06-09 17:07:20 -04:00
Siana Gearz
20ab55752d Remove megaregion support 2012-01-14 06:46:16 +01:00
Shyotl
b64cb8d339 Lineending fixup 2011-10-31 20:44:43 -05:00
Siana Gearz
174a33beb3 Variable size region support, by RevolutionSmythe 2011-08-04 22:20:25 +02:00
Shyotl
ce064f5af2 Some safe merging with v2. 2011-07-14 01:35:15 -05:00
Shyotl
d1d6994419 Full v2.6 renderer. 2011-05-12 00:13:38 -05:00
Siana Gearz
e89db0b4b1 HTTP links in group notices and extended group limit ready. 2011-01-04 14:48:23 +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
d68736da39 Put in some changes along sg1.4 dev history. 2010-11-21 15:57:44 +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