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

23461 Commits (e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f)

Author SHA1 Message Date
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
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 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
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 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 671a97ef76 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-04-22 22:28:41 +02:00
Melanie a7a92e7339 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-04-22 22:26:04 +02:00
Melanie 6571e7ead2 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:24:41 +02:00
Melanie 4aa6f2bbba Add the set object owner floater template 2013-04-22 22:23:42 +02:00
Diva Canto 6ddc39a676 Clean up unused config and config comments. 2013-04-21 16:56:18 -07:00
Melanie 231c298ca5 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	bin/OpenMetaverse.StructuredData.XML
	bin/OpenMetaverse.XML
	bin/OpenMetaverseTypes.XML
 2013-04-21 14:11:39 +01:00
dahlia 46e4ecadc8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-21 00:21:42 -07:00
dahlia 69f07fdb34 Materials persistence via SceneObjectPart.dynAttrs. This appears to work across region restarts and taking objects into inventory, but probably will not work across archiving via OAR or IAR as materials texture assets may not be adequately referenced to trigger archiving. 2013-04-20 23:39:07 -07:00
BlueWall 855c88a9c0 Fix spelling 2013-04-20 11:57:11 -04:00
BlueWall f40abc493a Small fix to prebuild xml for building with mono tools 2013-04-20 11:54:05 -04:00
dahlia 233f761779 handle PUT verb for RenderMaterials Cap 2013-04-20 02:08:22 -07:00
dahlia 258804cc04 RenderMaterials POST Cap now return material entries when invoked with an OSDArray of MaterialIDs 2013-04-19 22:19:57 -07:00
dahlia 9ae24cac2f Materials-capable viewers send ImageUpdate packets when updating materials that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed. 2013-04-19 00:35:06 -07:00
dahlia 06829c4082 remove default parameter value that apparently mono cant handle 2013-04-18 01:29:50 -07:00
dahlia d5419f0a46 Initial experimental support for materials-capable viewers. This is in a very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet. 2013-04-18 01:03:19 -07:00
dahlia 7c839f176f amend previous commit, a line was left out 2013-04-17 23:14:28 -07:00