OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
24,718 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

24718 Commits (31279a33081fae899151a9ae41aa785a2e828bd0)

Author SHA1 Message Date
Robert Adams 890cb6a293 BulletSim: complete BSShape classes. 2013-04-29 07:38:35 -07:00
Melanie 3ff7391495 Some more pieces of Avination's ban system - if an avatar isn't allowed on any 
parcel in the sim, keep them out entirely.
 2013-04-29 00:55:34 +01:00
Melanie 7c729e1519 Merge branch 'master' into careminster 2013-04-29 00:38:20 +01:00
Melanie 14f78c2e66 Merge branch 'ubitwork' into avination-current 2013-04-28 19:04:01 +02:00
ubit 61ea7ee5a9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 
Conflicts:
	bin/Regions/Regions.ini.example
 2013-04-28 20:40:11 +02:00
ubit 7000b52aeb Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-04-28 19:46:57 +02:00
Melanie 4275d7a839 Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 
Conflicts:
	bin/Regions/Regions.ini.example
 2013-04-28 19:03:39 +02:00
Diva Canto a517e597f5 Fix wrong sql statement in offline im. 2013-04-28 09:03:09 -07:00
Diva Canto a49c5291dc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-27 21:24:07 -07:00
Diva Canto 222f530411 Added an interface to an external ban service. With this commit, the interface is used only in Hypergrided worlds (Gatekeeper), although in those, it applies to both local and foreign users. The Ban service itself is not in core; it is to be provided externally. 2013-04-27 21:23:29 -07:00
Diva Canto 90a6891a7d Better error reporting 2013-04-27 10:34:23 -07:00
Diva Canto f675d465b2 Make method virtual 2013-04-27 10:34:13 -07:00
Melanie 12599c34e2 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-04-27 17:57:22 +01:00
Melanie cbb3bb62da Unbreak the sample money module 2013-04-27 17:56:39 +01:00
Melanie ef08ab68a7 Small oversight in EconomyDataRequest - this would have affected everyone NOT using a money module. 2013-04-27 17:42:54 +01:00
Melanie 3fcac2ba7b Controller module for dynamic floaters (WIP) 2013-04-27 01:20:03 +02:00
Diva Canto 2262b13048 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-25 17:02:32 -07:00
Diva Canto 0e162511cf Groups: make some methods protected. 2013-04-25 17:01:57 -07:00
Melanie 40036ca05f Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. 
Sending the reply requires having the IClientAPI.
 2013-04-25 21:37:40 +01:00
Melanie fb8aa22084 Merge branch 'master' into careminster 2013-04-25 21:37:25 +01:00
Melanie 03c9d8ae4f Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. 
Sending the reply requires having the IClientAPI.
 2013-04-25 21:35:18 +01:00
Melanie 38bbf79e10 Merge branch 'master' into careminster 2013-04-25 20:48:41 +01:00
Melanie 5d0a8ff391 Change copyright notice on DynamicMenuModule to proper BSD 2013-04-25 20:48:12 +01:00
Melanie c6628b1c76 Merge branch 'master' into careminster 2013-04-25 20:47:55 +01:00
Diva Canto 3bc8017464 Recover a lost "virtual". Downstream projects need this. 2013-04-25 09:23:15 -07:00
dahlia c10405330d UUIDGatherer now includes UUIDs which reference texture assets used as materials 2013-04-24 20:43:15 -07:00
Diva Canto 0e22021c65 Make the kicked user's avie truly disappear when it's god-kicked. 2013-04-24 19:00:41 -07:00
Diva Canto 2093d87e20 Make the kicked user's avie truly disappear when it's god-kicked. 2013-04-25 02:48:49 +01:00
Melanie ec4f981f1d Adding the dynamic menu module which allows registering new menu options in compliant viewers 2013-04-25 01:52:34 +01:00
Melanie c7a0ce0865 Merge branch 'master' into careminster 2013-04-25 00:52:29 +01:00
Melanie 5cd77a460c Commit Avination's God Kick feature. 2013-04-25 00:51:57 +01:00
Melanie 3934b779b8 Adding the dynamic menu module which allows registering new menu options in compliant viewers 2013-04-25 01:39:22 +02:00
Melanie e39156c656 Send 503 when throttling textures 2013-04-25 01:38:21 +02:00
Melanie 51e05dcb5b Gods module cleanup 2013-04-25 01:37:18 +02:00
Melanie 9b67027841 Merge branch 'master' into careminster 2013-04-25 00:25:09 +01:00
Melanie 6f3c905744 Add Avination's support for parcel eject and freeze 2013-04-25 00:24:48 +01:00
Melanie d36a52ea55 Merge branch 'master' into careminster 2013-04-25 00:22:28 +01:00
Robert Adams 1593d795ea BulletSim: version of libBulletSim.so for 32 bit systems that doesn't 
crash on startup. Doesn't yet solve the new glibcxx dependencies.
 2013-04-24 15:01:11 -07:00
Diva Canto 1868680848 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-24 12:46:23 -07:00
Diva Canto 70081a40a4 Bug fix: compare tolower. This should fix the issue where HG visitors currently in the region were not being found by the avatar picker window. 2013-04-24 12:45:19 -07:00
Robert Adams c22a2ab7d2 BulletSim: partial addition of BSShape class code preparing for 
different physical mesh representations (simplified convex meshes)
and avatar mesh.
 2013-04-24 08:05:42 -07:00
Robert Adams e324f6f3f0 BulletSim: update DLLs and SOs to they have no dependencies on newer 
glibc (2.14) since that is not yet in some Linux distributions.
Add unmanaged API calls and code for creating single convex hull shapes.
 2013-04-24 08:03:45 -07:00
Robert Adams 522ab85045 BulletSim: improve avatar stair walking up. Add more parameters to control force 
of both position change and up force that move avatars over barrier.
Default parameters are for steps up to 0.5m in height.
 2013-04-23 18:31:12 -07:00
dahlia ed22014646 revert CSJ2K.dll to version in use prior to commit d4fa2c69ed 2013-04-23 15:01:20 -07:00
Justin Clark-Casey (justincc) 115e0aaf83 Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if any number of avatars other than 1 was in the region. 
I don't know how well the rest of ConiergeModule works since I've practically never looked at this code.
Addresses http://opensimulator.org/mantis/view.php?id=6605
 2013-04-23 21:55:51 +01:00
Robert Adams e1ac683154 BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's check for an object being linked into the world does not work for Bullet's ghost objects so BulletSim was deleting the object while it was still linked into the physical world structures. 2013-04-22 16:50:06 -07:00
Melanie 293a024c14 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:39:08 +01:00
Melanie 8b57ee4fd1 Merge branch 'master' into careminster 2013-04-22 22:38:58 +01:00
Melanie 3e818eaeb5 Add the enter uuid dialog 2013-04-22 22:58:33 +02:00
Melanie 671a97ef76 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-04-22 22:28:41 +02:00