Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,357 Commits 20 Branches 51 Tags
f05edda4f4fd4f2386e06ac7dcbdb38b0eb35fc1
Commit Graph

132 Commits

Author SHA1 Message Date
Siana Gearz
f05edda4f4 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloatermessagelog.cpp
	indra/newview/llstartup.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/menu_inventory.xml
 2012-03-28 22:27:45 +02:00
Siana Gearz
2e5ea4f5a7 Fix proxy setting initialization 2012-03-24 16:19:14 +01:00
Shyotl
90f12f1bb9 Removed some dead code. Refresh avatar textures upon entering customize. Disabled an old emerald hack that seems to contribute to baking issues-- will look into further if it indeed was a problem. 2012-03-22 00:56:10 -05:00
Siana Gearz
8b6f462d13 Wholesale update of llmessage to V3.2 
Note that this removes message logger for now.
 2012-03-06 07:31:15 +01:00
Shyotl
dcec1cb5f2 LLViewerWindow::handlePerFrameHover renamed to LLViewerWindow::updateUI. Migrated some code to LLViewerWindow::updateMouseDelta, but made no functional change. Use LLSelectMgr to look up selected textures for texture view (opposed to soon-to-be-removed llhoverview) 2012-02-24 20:18:46 -06:00
Shyotl
a6a69caa4f Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp
 2012-02-24 13:21:59 -06:00
Siana Gearz
a1038f3972 Merge git://github.com/LightDrake/SingularityViewer 2012-02-23 03:06:19 +01:00
Shyotl
3d39e443fe Append username to window title upon connecting to grid. 2012-02-22 17:51:06 -06:00
Aleric Inglewood
39f8deb498 Merge remote-tracking branch 'siana/master' 2012-02-19 23:54:59 +01:00
Drake Arconis
925c42294f OS X Builds now. 
Fixed building on OS X.
Fixed line endings.
Need to find better way to do fmodwrapper thing.
 2012-02-19 11:30:27 -05:00
Siana Gearz
f7cc9c4d33 Hopefully more correctness in grid manager editor 2012-02-19 00:42:23 +01:00
Aleric Inglewood
88d0983e37 LLViewerRegion WIP: this should compile now. 2012-02-18 02:22:48 +01:00
Shyotl
ae7b12f230 Interim commit before diving into reworking the inventory panel. 2012-02-16 19:25:59 -06:00
Shyotl
a90d7bbb46 Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables. 2012-02-16 12:00:38 -06:00
Siana Gearz
aaf1e4d21b Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2012-02-11 16:58:27 +01:00
Shyotl
9f9a4cbaaf Brought over LLAvatarPropertiesProcessor, and updated relevant floaters to utilize it. (Mainly in the avatar properties floaters) 2012-02-11 04:07:34 -06:00
Siana Gearz
acf378e9f2 Auto-version system 2012-02-09 14:03:49 +01:00
Siana Gearz
3d40cd86ac Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2012-02-05 15:14:53 +01:00
Shyotl
b0ccec2b62 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 
Conflicts:
	indra/newview/llvoavatar.cpp
 2012-02-01 03:10:46 -06:00
Siana Gearz
071745007a Partial port of Phoenix Windlight parts 2012-02-01 06:36:10 +01:00
Aleric Inglewood
315552d1e0 Allow main window to be unfocused during startup in debug mode. 2012-02-01 03:34:19 +01:00
Shyotl
a0c549534f Pulled apart LLInventoryPanel and LLInventoryView. TODO: LLInventoryView needs to be chopped apart into a floater (LLFloaterInventory) and a panel (LLPanelMainInventory). 2012-01-29 17:10:04 -06:00
Siana Gearz
d385de9139 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llstartup.cpp
	indra/newview/llviewerregion.cpp
 2012-01-24 21:22:49 +01:00
Shyotl
c4e0122846 Call display_startup() periodically during initilization to avoid buggy drivers/windows from issuing vpu recover erroneously. 2012-01-23 20:36:25 -06:00
Shyotl
6374f012de new fasttimers, including ui. 2012-01-23 18:30:54 -06:00
Shyotl
4a4b786a60 New inventory observer implementation. 2012-01-21 04:54:39 -06:00
Shyotl
40400d696b Updated inv fetching impl. Haven't ticked on new caps. 2012-01-21 00:11:19 -06:00
Shyotl
4c201a9b83 Inv fetch migrated from LLInventoryModel to LLInventoryModelBackgroundFetch singleton. 2012-01-20 19:09:44 -06:00
Siana Gearz
20ab55752d Remove megaregion support 2012-01-14 06:46:16 +01:00
Lirusaito
9d3b276f61 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-12 23:39:16 -05:00
Shyotl
1cc33caaa3 Pulled llinventorymodel apart into llinventorymodel, llinventoryobserver and llinventoryfunctions 2012-01-12 18:57:10 -06:00
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