Commit Graph

101 Commits

Author SHA1 Message Date
Lirusaito
8543106f5e Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-11 02:28:14 -05:00
Shyotl
68bc6749e5 Hooked LLTrans into LLNotification stuffs. Also, fixed [CURRENCY] showing up in several places on the buy land window. 2012-01-11 00:49:14 -06:00
Lirusaito
c5d4ccc78d Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-09 17:59:17 -05:00
Shyotl
e847b105f2 CURRENCY added as a default token replacement within LLTrans. (Will be useful when strings are migrated from ui xmls to strings.xml). Also, fixed compile (missed llwindowcallbacks.cpp in my previous commit) 2012-01-09 16:54:13 -06:00
Lirusaito
61beedd3d9 Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
2012-01-09 05:40:03 -05:00
Shyotl
e9bd6a3b0d Better translation support relating to client initialization/login. 2012-01-09 01:40:30 -06:00
Shyotl
a3f7399d7d Added media ticker to Singularity menu. Will be greyed out for anything not FMOD based. Consider implementing in other sound libraries as a to-do. FMOD Ex also displays an oscillator (making fmod3 do this is too dirty, so that's not going to be backported). 2012-01-03 20:27:56 -06:00
Shyotl
b4dad425aa Fixed wind not mixing with other audio. Play no more than 30 world sounds at once (new sounds just muted until channels free up). Add fmod profiler support (SHEnableFMODExProfiler). Use FMOD_UNICODE on windows instead of loading files manually and sending raw data to fmod. Incl other misc cleanup. 2011-12-23 02:29:49 -06:00
Shyotl
c73414f1a1 A stab at fmodex support on windows. To use, install 'FMOD Ex Programmers API' to its defualt program files directory, and run develop.py with -DFMODEX:BOOL=ON set. That /should/ be all it takes. 2011-12-22 18:01:07 -06:00
Shyotl
0030ca3af7 Fixed extra post-process shaders. Cleaned up and no longer using deprecated functions. 2011-12-16 01:46:20 -06:00
Shyotl
81499fc6ea -Font init cleanup. Now has a dedicated position in startup initilization. 2011-12-10 22:45:42 -06:00
Shyotl
67230a3290 Line-ending fixup. 2011-10-17 14:11:30 -05:00
Siana Gearz
c9e40f666d Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
Conflicts:
	indra/llmessage/message_prehash.cpp
	indra/llmessage/message_prehash.h
2011-10-14 02:44:20 +02:00
Shyotl
36e0f667d5 gAgent.set/getInventoryRootID() changed to gInventory.set/getRootFolderID() 2011-10-12 02:29:12 -05:00
Siana Gearz
ff0c7a1925 Merge https://github.com/TighMacFanatic/SingularityViewer into future
Conflicts:
	etc/message.xml
2011-10-09 02:08:20 +02:00
Shyotl
42938abf9b Static VFS now supported for gAssetStorage lookup. 2011-10-08 02:59:47 -05:00
Shyotl
02c2283e11 Cleanup. Mostly harmless. A few gAgentAvatarps changed to isAgentAvatarValid(), which is the only 'change' in behavior. Everything else is insignifigant syntax touchup and shuffling of inlines from headers to cpp files. 2011-10-08 02:53:03 -05:00
TighMacFanatic
ed8fad3fd9 Merge branch 'future' of https://github.com/siana/SingularityViewer 2011-10-05 20:17:24 -04:00
Shyotl
74dc875a27 Beginning to pull LLVOAvatarSelf out from LLVOAvatar. 2011-10-02 02:51:10 -05:00
TighMacFanatic
00699801d2 Merge branch 'future' 2011-09-24 22:36:40 -04:00
Shyotl
36600462d1 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing
Conflicts:
	indra/newview/hippopanelgrids.cpp
	indra/newview/llstartup.cpp
	indra/newview/llsurface.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/llviewerparceloverlay.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworld.cpp
2011-09-09 16:53:12 -05:00
Shyotl
417f5084b4 Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places. 2011-09-03 19:30:42 -05:00
Shyotl
7b2aa741aa LLGestureManager renamed to LLGestureMgr. Also, derived from LLSingleton. 2011-09-03 06:46:47 -05:00
Shyotl
443d4e9f56 Windlight/water parameter managers now derived from standard LLSingleton instead of using some silly redundant clone. 2011-09-02 06:35:53 -05:00
RevolutionSmythe
b8cd305f89 Get rid of grid nicks, and just use the Grid Name everywhere (its cleaner, and one less thing to fill out). 2011-08-18 20:56:35 +02:00
RevolutionSmythe
d84140ead9 Add Aurora to the grid info platform list. Attempt to stop sending "resident" as the last name, except with Second Life. 2011-08-18 20:56:03 +02:00
Shyotl
1c38d016d5 Removed old RLV code. Plugged holes with RLVa. 2011-08-14 02:33:57 -05:00
Siana Gearz
174a33beb3 Variable size region support, by RevolutionSmythe 2011-08-04 22:20:25 +02:00
Siana Gearz
d255bfa6f7 Variable size region support, by RevolutionSmythe 2011-08-03 17:40:06 +02:00
Shyotl
7e0ee6bb71 Shiny new name cache. 2011-07-15 00:21:38 -05:00
Siana Gearz
6348635d3f Ïntroduced LLFolderType and LLViewerAssetType (by Shyotl) 2011-06-23 21:11:52 +02:00
Siana Gearz
e956487dd8 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2011-06-16 01:53:53 +02:00
Siana Gearz
c82cf613a6 Better saved logins, with grid
Please, someone throw away the oodles of dead, confusing and redundant code -.-
2011-06-15 15:14:55 +02:00
Aleric Inglewood
a8d71f2550 Merge remote-tracking branch 'origin/master' 2011-06-14 16:02:43 +02:00
Shyotl
25bb20046b Added AllowLargeSounds setting to disable v2 sound-decode strictness
Conflicts:

	indra/newview/app_settings/settings.xml
2011-06-09 16:53:46 -05:00
Shyotl
c57b97c8df LLAgentWearables Transition (1/1) 2011-06-09 01:35:49 -05:00
Shyotl
b691e2b286 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 2011-06-08 14:19:43 -05:00
Shyotl
a07e399801 LLAgentCamera transition (1/2) 2011-06-07 21:35:10 -05:00
Siana Gearz
630059a74f Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/llpaneldisplay.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
2011-06-05 19:56:46 +02:00
Aleric Inglewood
fed8951e00 Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer 2011-06-03 22:48:23 +02:00
Shyotl
49b893c806 Removed most OGPX related code. 2011-05-28 17:11:10 -05:00
Aleric Inglewood
e3742734f0 Beacons (floater) fixup
After a user spend three days trying to find out why certain
textures looked red (as if they had alpha and you pressed
control-alt-T, but not all of them were like that); and nothing
helped, not relogging, not clearing cache, not even reinstalling
the viewer... I decided to take this bug serious. Note that,
according to Shyotl, there have been more users every now and
then that reported this problem.

The problem (after doing a research for 1 hour) turned out
to be that she had beacons on, highlighting prims with scripts.
The immediate bug is, of course, that this was persistent over
a relog. Upon further investigation, this bug exists because
a Debug Setting had a double meaning: it meant both "beacon
floater is visible", which you want to be persistent, and it
was later renamed and given the meaning "Keep beacons when
closing the floater". Digging deeper it turned out that there
was a REAL mess with regard to the beacons: A non-finished
floater with immature comments (called "dingdong floater") was
half-created and replaced the original floater which, according
to the comment was "so fucked over and over" (== commented out
in several places), but then everything was commented out and
replaced with a menu (because they couldn't get it to work?).
The floater simply didn't exist anymore! That reduced the
meaning of the Debug Setting to "Show beacons", although you
now could only set it in the menu by clicking on "Beacons Always On"
where 'Always' refers to also on when the floater isn't there.

I nuked the immature dingdong code, brought back the original
floater as it was in snowglobe (and still is in Imprudence),
fixed it up a bit with a nicer layout (indentation and spacing)
and disabling (graying out) when needed, and added a new checkbox
that will allow people to still keep/see the beacons after closing
the floater.

In the end this requires THREE Debug Setting variables:
ShowBeaconsFloater : TRUE when the floater is visible, FALSE when not.
                     This is persistent, so the floater is still
		     there if you relog with the floater open.
BeaconsKeepVisible : TRUE when the new checkbox is checked.
		     Also persistent.
BeaconsVisible : TRUE when the beacons are rendered, FALSE otherwise.
		 This is NOT persistent: we don't want unsuspecting
		 users to try and get rid of the weird 'red prims'
		 by relogging and failing at that.
2011-05-25 19:55:42 +02:00
TighMacFanatic
2b412bffec Updated preferences system for bug fixes and user friendliness. 2011-05-17 12:54:30 -04:00
Aleric Inglewood
ea2cc3e0de Make FilePicker context sensitive default paths persistent over logins.
Also, make newview/statemachine a separate project.
2011-05-13 23:50:56 +02:00
Aleric Inglewood
92696623e0 Start up crash of LLErrorThread due to corrupt map in CheckLevelMap
Wrapped gSettings and the global objects returned by Settings::get() and
Globals::get() in AIThreadSafe, forcing thread-safe access.

This solves the problem of possible corruption of the various LevelMap's
in LLError::Settings due to thread unsafe accesses.
2011-05-05 15:41:19 +02:00
Aleric Inglewood
ab5915c16c LindenUserDir fixes.
Patch from 2010-10-20/22. Didn't apply cleanly so I redid it
manually and tested/checked it. There was only one difference
with imprudence: for some reason Singularity tries to see
if the "teleport history" floater is visible while initializing
the menu's, something that imprudence doesn't do. For the rest
the patch is basically the same. Nevertheless, I left all code
exactly as it was in Singularity (the only thing that this
commit changes is the intend of the original patch: in debug
mode, fail with an assertion when LindenUserDir is called while
it is not initialized; and then fix everything to make it work
again.

Original commit message:

The LindenUserDir (~/.imprudence/first_last/) cannot be initialized
before the user logged in. However, several singletons (that only can be
initialized once) depend on this directory for initialization. Therefore
we have to take care not to instantiate those singletons until after the
user logged in.

With regard to webit, this fixes the browser_profile (cache and cookies)
directory that the builtin browser uses.
2011-05-04 17:54:57 +02:00
Siana Gearz
04b3dee767 Merge remote-tracking branch 'shyotl/V2TextureSystem' 2011-04-26 00:28:58 +02:00
tmac@latestevidence.com
af203533b3 Spell check added 2011-04-23 18:08:59 -04:00
Shyotl
4d4c49cd24 Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
2011-04-12 22:29:49 -05:00
Siana Gearz
fd8866c411 Sione's Media Filter 2011-04-08 19:53:41 +02:00