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

148 Commits

Author SHA1 Message Date
Siana Gearz
26109ca8f9 Assert fix 2012-08-09 04:50:48 +02:00
Siana Gearz
7743843a27 Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer 
Conflicts:
	indra/newview/skins/default/xui/en-us/strings.xml
 2012-08-09 03:46:03 +02:00
Siana Gearz
c84e145557 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp
 2012-08-09 02:11:14 +02:00
Siana Gearz
68ad5411c9 Shyotl's old llcurl 2012-08-07 13:13:45 +02:00
Drake Arconis
af89351432 Cookies. 
Enabled use of the cookie store.
 2012-08-03 08:49:01 -04:00
Drake Arconis
dc5bfc1c41 Bit of cleanup 
More cleanup and updates to llcommon
Removed legacy code and files
 2012-08-02 23:19:07 -04:00
Shyotl
531af998fb MAINT-775: Fix for particle index pool corruption on teleport. (And removed alternative workaround) https://bitbucket.org/davep/viewer-development/changeset/04fdf7945708 2012-07-20 11:29:11 -05:00
Shyotl
67e1a3b004 Lindie viewer-dev catchup regarding rendering pipeline. 2012-06-30 20:05:31 -05:00
Shyotl
51a4e4960f V3 merge. Added LLMainLoopRepeater repeater. Disabled FBOs for baking. Fixed typo in strings.xml. Setting ThrottleBandwidthKBPS was used in a few places that MainloopTimeoutDefault should have been. Better outdated driver detection for ATI hardware. 2012-05-28 03:59:19 -05:00
Shyotl
3cc37fb12b LLAgentCamera update. Culled a bunch of dead code from llappviewer. Moved build-mode toggle off into lltoolmgr. 2012-04-22 19:42:37 -05:00
Shyotl
5ba68ed763 Updated buy land floater a bit. Fixed a persistent shutdown crash. Updated texture Texture Console. 2012-04-17 18:44:41 -05:00
Shyotl
ee84500735 Added some cursory direct-delivery support. 2012-04-16 23:33:34 -05:00
Shyotl
b49ad1cd34 RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater. 2012-04-12 10:29:45 -05:00
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
70438fa06f Catching up with Lindies part 3 2012-03-26 15:01:53 +02:00
Shyotl
c07d90a2ba Rename box now properly aligned in the inventory panel. Commented out some ascent stuff pertaining to drag and drop because, well, it seemed weird. 2012-03-19 23:32:48 -05:00
Siana Gearz
8b8fe82c8e Correct facepalm in llmessage port 2012-03-20 03:17:37 +01:00
Siana Gearz
5d6b925823 We have persistent console and multi-instance settings and don't need them forced on debug builds 2012-03-12 19:54:44 +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
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
acf378e9f2 Auto-version system 2012-02-09 14:03:49 +01:00
Shyotl
9ee0c5acf3 Having BackgroundYieldTime set to a large enough value would cause a stall if client isn't in focus during login. 2012-02-02 23:44:35 -06: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
Shyotl
9453c2c2e9 Memory tracking system updated. 2012-01-29 01:33:14 -06:00
Shyotl
d9640ecc65 Little cleanup regarding crashlogger toggling. 2012-01-28 22:02:10 -06:00
Siana Gearz
7d9299d870 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-01-25 22:18:21 +01:00
Shyotl
6374f012de new fasttimers, including ui. 2012-01-23 18:30:54 -06:00
Aleric Inglewood
c4e55464c9 Resolved collisions of merge with siana/master 2012-01-22 01:32:52 +01:00
Siana Gearz
4feb69e342 Crouch toggle rewrite - removed garbage. 2012-01-12 06:35:42 +01:00
Lirusaito
4de23007a5 Added crouch toggle, global bool called isCrouch, function agent_toggle_down bound to toggle_down. 
Shift+crouch=toggle, crouch doesn't work while toggle crouched, at the moment.
Formatted keys.ini to be completely aligned.
 2012-01-11 11:04:12 -05: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
dff195d120 Several transparent ui-related components were writing to the depthbuffer for some silly reason. Don't do that since it messes with occlusion. 2011-12-30 19:15:21 -06:00
Siana Gearz
fd22d80dfd Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
	indra/newview/llmanipscale.cpp
	indra/newview/llmeshrepository.cpp
	indra/newview/llviewerregion.cpp
	indra/newview/llvovolume.cpp
 2011-12-24 20:12:12 +01:00
Shyotl
ffb285c6ff Huge renderer update (WIP). Still plenty to do, especially pertaining to UI. 
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
 2011-12-09 14:02:29 -06:00
Siana Gearz
697dd7e929 Preparing to add mesh upload. 2011-12-03 03:43:23 +01:00
Siana Gearz
8421661a89 Version 1.6.0(3) 2011-11-08 01:27:12 +01:00
Shyotl
c413d62536 Decouple RenderUseFBO from RenderDeferred, as toggling deferred would leave RenderUseFBO enabled regardless of previous setting. 2011-10-17 14:11:10 -05:00
Shyotl
4963a064f1 Removal of discarded inventory offers moved to deferred (idle) tick. Nested gInventory.notifyObservers() don't work. 2011-10-12 23:48:25 -05:00
Shyotl
d7e5c4054f gInventory.cleanupInventory() wasn't called on shutdown. 2011-10-12 23:48:03 -05:00
Shyotl
36e0f667d5 gAgent.set/getInventoryRootID() changed to gInventory.set/getRootFolderID() 2011-10-12 02:29:12 -05:00
Shyotl
d40dcfa1cd Updated LLInventoryModel a bit. Safer cleanup, prevention of recursive notifyObservers calls, more sanity checks, added idleNotifyObservers that will call notifyObservers if stale flag(s) found. 2011-10-10 00:19:01 -05:00
Shyotl
30a95e7f45 Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes. 2011-10-03 22:45:13 -05:00
Shyotl
d917bf6b06 LLAPRFile cleaned up 2011-09-20 21:39:27 -05: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