Justin Clark-Casey (justincc)
|
0beccf23c0
|
Add regression test for inventory item give, reject and subsequent trash folder purge by receiver.
This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
|
2013-04-29 21:11:44 +01:00 |
|
Justin Clark-Casey (justincc)
|
a7cbb9edc9
|
Add regression test for offer, accept and subsequent receiver delete of an item offered via instant message.
|
2013-04-29 20:50:49 +01:00 |
|
Justin Clark-Casey (justincc)
|
12054aaa9f
|
Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
|
2013-04-29 17:14:44 +01:00 |
|
Robert Adams
|
92ee288d66
|
BulletSim: remove trailing white space to make git happier. No functional changes.
|
2013-04-29 07:54:50 -07:00 |
|
Robert Adams
|
ad1787770e
|
BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_physicsScene' to match coding conventions and reduce confusion.
|
2013-04-29 07:38:55 -07:00 |
|
Robert Adams
|
21ec434688
|
BulletSim: first cut at new linksetCompound shape building.
|
2013-04-29 07:38:51 -07:00 |
|
Robert Adams
|
f2d408829b
|
BulletSim: fix crash when creating new hull.
|
2013-04-29 07:38:47 -07:00 |
|
Robert Adams
|
2da8e60b6d
|
BulletSim: code for creating the avatar capsule shape.
|
2013-04-29 07:38:44 -07:00 |
|
Robert Adams
|
e5582939fd
|
BulletSim: massive refactor of shape classes. Removed shape specific code from BSShapeCollection. Using BSShape* classes to hold references to shape. Simplified shape dependency callbacks. Remove 'PreferredShape' methods and have each class specify shape type. Disable compound shape linkset for a later commit that will simplify linkset implementation.
|
2013-04-29 07:38:40 -07:00 |
|
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 |