Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,836 Commits 20 Branches 51 Tags
803e92020b8564673db25dae9012b4aefd54e44f
Commit Graph

842 Commits

Author SHA1 Message Date
Siana Gearz
dbdd0ec4f1 Merge branch 'Canon' of git://github.com/Lirusaito/SingularityViewer 2013-02-17 15:40:27 +01:00
Siana Gearz
0f54a2777e Merge branch 'master' of git://github.com/lkalif/SingularityViewer 2013-02-17 15:36:59 +01:00
Siana Gearz
49c872c86d Merge branch 'sunshine' of https://github.com/Shyotl/SingularityViewer 2013-02-17 15:28:48 +01:00
Shyotl
c3c34deb10 Added reload option to attachment 'tool' pie submenu. 2013-02-17 02:55:05 -06:00
Shyotl
4cc35d6c66 Fixed up some silly issues with the client tag system. 2013-02-17 02:54:30 -06:00
Shyotl
2f5ab6f8e8 Once more, with feeling. (currency transaction messages) 2013-02-13 16:31:16 -06:00
Lirusaito
7ca767275f Add support for CustomMenuAction Capability 2013-02-13 13:00:40 -05:00
Aleric Inglewood
b40e8fb508 Add checkbox "Keep aspect ratio" to snapshot floater. 2013-02-12 22:21:39 +01:00
Lirusaito
88ce171f1e Initial Portuguese translation, contributed by Knolan Falconer 2013-02-11 01:19:36 -05:00
Lirusaito
1d4858ae85 Add support for two non-SL grid features/flags. 
Adds support for GamingData cap, and flags: PF_GAMING, DFQ_FILTER_GAMING, REGION_FLAGS_GAMING, and REGION_FLAGS_HIDE_FROM_SEARCH
Adds GamingCheck to floater_about_land.xml
Adds filter_gaming checkboxes to floater_directory* xmls
Adds "is gaming" and "hide from search" checkboxes to floater_god_tools.xml
 2013-02-11 01:14:09 -05:00
Lirusaito
cff7a2a464 Brought in Script Limits from v-d! (Accessible from About Land) 2013-02-11 01:12:21 -05:00
Latif Khalifa
56b2c10312 Renamed deferred rendering switch from 'Lightning and Shadows' to 'Advanced Lighting Model' as per upstream 2013-02-07 18:17:15 +01:00
Lirusaito
73dab7e00b Fix Sappa's issue with getString log spam, three strings weren't quite in the right xml. 2013-02-06 22:55:19 -05:00
Lirusaito
3d9c287410 Minor french translation update, thanks Nomade~ 2013-02-06 00:27:22 -05:00
Siana Gearz
dc3f91b121 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-02-03 22:27:53 +01:00
Lirusaito
46ddc9b6be Skins Request: Nano Green and Nano Purple 2013-01-31 21:18:50 -05:00
Latif Khalifa
70eeddabba Merge remote-tracking branch 'shyotl/sunshine' 2013-01-31 17:20:58 +01:00
Shyotl
be0d751334 Cleanup, further hardening of namecache callbacks, and update to avatar picker. 2013-01-30 22:04:04 -06:00
Lirusaito
bf8bd9cb1a Further notifications.xml touchup. 2013-01-30 19:16:56 -05:00
Lirusaito
e009b8f4b4 Added simple codeless floaters for My Outfits and Favorites folders, entries are in World menu. 2013-01-30 14:11:22 -05:00
Latif Khalifa
046735f043 Merge remote-tracking branch 'upstream/exp' 2013-01-30 05:49:45 +01:00
Latif Khalifa
8edb10fb88 Merge remote-tracking branch 'aleric/meshupload' into meshupload 2013-01-30 05:12:04 +01:00
Aleric Inglewood
8aecc49456 Add missing notifications. 2013-01-30 03:58:42 +01:00
Latif Khalifa
8584e6da4c Merge branch 'master' into meshupload 
Conflicts:
	indra/llcommon/llhash.h
	indra/newview/CMakeLists.txt
	indra/newview/llfloatermodelpreview.cpp
	indra/newview/llfloatermodelpreview.h
	indra/newview/llpanelprofile.h
 2013-01-30 00:36:31 +01:00
Aleric Inglewood
b3adf71ed7 Remember floater rectangle 2013-01-29 23:20:02 +01:00
Siana Gearz
4cab6a89a9 1024-sized terrain texture support 2013-01-27 06:06:13 +01:00
Latif Khalifa
d8c846288e Merge remote-tracking branch 'lirusato/master' 2013-01-22 20:06:03 +01:00
Aleric Inglewood
db7155666d Merge branch 'master' into meshupload 
Conflicts:
	indra/cmake/00-Common.cmake

One diff added /MP to CMAKE_CXX_FLAGS_DEBUG while
another removed /arch:SSE2 from the same line.

Fixed to honor both changes.
 2013-01-21 19:16:06 +01:00
Lirusaito
aa3228be76 French translation update, thanks Nomade~ 2013-01-20 10:25:19 -05:00
Lirusaito
c2ce72ed94 Issue 604: Reset Button for inventory 
Attempted Spanish translation.
Nomade Zhao provided French.
 2013-01-20 10:15:23 -05:00
Aleric Inglewood
7a8a2757db Add comment for sake of translation. 2013-01-18 16:10:18 +01:00
Latif Khalifa
9240147874 Merge remote-tracking branch 'lirusato/master' 2013-01-17 17:26:00 +01:00
Lirusaito
05a6323d2c French antispam controls touchup 2013-01-17 09:17:43 -05:00
Lirusaito
1dd0b7713b French translation fixies~ 2013-01-17 03:38:53 -05:00
Latif Khalifa
f03405ca47 Merge remote-tracking branch 'lirusato/master' 2013-01-16 16:25:37 +01:00
Lirusaito
0405ed9e3d French Translation update. 2013-01-16 09:27:25 -05:00
Lirusaito
53c04b7299 Issue 220: Copy/paste params in the build tools like phoenix 
Adds mClipboardFlexiParams, mClipboardLightParams, mClipboardSculptParams, and mClipboardLightImageParams to LLPanelObject.
Corrects the tooltip on the the copy button.
 2013-01-15 22:43:22 -05:00
Latif Khalifa
3bf307abb0 Merge remote-tracking branch 'shyotl/master' 2013-01-15 18:37:09 +01:00
Latif Khalifa
8cec9c7b73 Merge remote-tracking branch 'lirusato/master' 2013-01-15 18:36:39 +01:00
Shyotl
2a8f55e99e Updated gesture floater to use more modern (and actual working) method of adding list elements via xml. 2013-01-14 18:41:48 -06:00
Lirusaito
0494dc8d32 Fix Issue 432: Radar Keeps Popping Up and side issue I got still the window "An object owned by you ..." 
Unified key message sending to function send_keys_message()
Switched a few getBOOLs to CachedControls
Added RadarChatKeysStopAsking, and RadarChatKeysRequest as a three button notification so the user can decide to permanently say no.
Corrected RadarChatKeys description to be more accurate.
If we want to know if the radar is open, we check instanceExists, not getInstance.
Also enabled using the announce button when RadarChatKeys is false to announce keys, for manual updates.
 2013-01-14 06:34:27 -05:00
Latif Khalifa
3dd33518c4 Merge remote-tracking branch 'shyotl/master' 2013-01-14 10:53:27 +01:00
Shyotl
db8225a078 Fixup LLScrollListCtrl::setCommentText, and incorrect behaviors with script editor and bulk perm editor pertaining to setCommentText inherited from V3. 2013-01-14 03:36:04 -06:00
Damian Zhaoying
00fb7804da Spanish Translate for new Group/Chat/IM floaters and some general string fixed 2013-01-13 19:05:35 -03:00
Siana Gearz
188e42ee4a Merge branch 'meshupload' of git://github.com/AlericInglewood/SingularityViewer into meshup 2013-01-13 20:10:25 +01:00
Aleric Inglewood
e7dea2714e Merge branch 'master' into meshupload 2013-01-13 18:02:28 +01:00
Aleric Inglewood
dcc2e52c61 Merge remote-tracking branch 'singu/master' 2013-01-13 18:01:48 +01:00
Aleric Inglewood
db17b93156 Merge branch 'master' into meshupload 
Conflicts:
	indra/newview/llmeshrepository.cpp

Added /* */ around the 'virtual' keyword in two places
that collided with changes in meshupload from lightdrake.
 2013-01-13 17:59:49 +01:00
Latif Khalifa
cef7ea9f5e Merge remote-tracking branch 'lirusato/master' into 1.7.3-dev 2013-01-13 12:45:37 +01:00
Latif Khalifa
31d2a15957 Merge remote-tracking branch 'aleric/master' into 1.7.3-dev 2013-01-13 12:45:25 +01:00