Diva Canto
eff641ab83
Added Old Guids=true to all MySql connection strings.
2010-06-12 17:08:05 -07:00
Diva Canto
b3594681a4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 12:09:06 -07:00
Diva Canto
66619b5996
Added checks for failed UpdateAgent calls.
2010-06-12 12:08:45 -07:00
Melanie
5e4bee0f34
Merge branch 'master' into careminster-presence-refactor
2010-06-12 19:15:59 +01:00
Melanie
59acb37d92
Change name of method to better reflect what it does
2010-06-12 19:14:46 +01:00
Diva Canto
b9c01a1c42
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 11:11:48 -07:00
Diva Canto
e6efe34b4c
* Added CHANGED_TELEPORT event trigger upon inter-sim teleports.
...
* Cleaned up NewUserConnection.
2010-06-12 11:11:13 -07:00
Melanie
4950ee5f3b
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-12 16:27:55 +01:00
Melanie
d2342319da
Merge branch 'master' into careminster-presence-refactor
2010-06-12 16:27:37 +01:00
Melanie
ceac35bac1
Log and eat sculpt meshing exceptions caused by bad jp2 data.
2010-06-12 16:25:40 +01:00
Tom Grimshaw
63531b1df5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-12 04:36:14 -07:00
Tom Grimshaw
3ea11fe2e6
Get rid of spamming SOG debug message
2010-06-12 04:35:51 -07:00
Melanie Thielker
3c036934a3
Preserving the link numbers is a serializer's highest duty.
...
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:28:00 +01:00
Melanie Thielker
4c58ac2c90
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:35:03 +01:00
Melanie
65f03af38f
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 07:34:55 +01:00
Melanie Thielker
03a48f87e4
Preserving the link numbers is a serializer's highest duty.
...
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:29:20 +02:00
Melanie Thielker
e337c9130f
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:34:22 +02:00
Melanie
57a60282f5
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 06:57:10 +01:00
Melanie
0ece71f8d1
Merge branch 'master' into careminster-presence-refactor
2010-06-12 06:14:10 +01:00
Melanie
92fea025cb
Resume scripts that have been rezzed from a prim
2010-06-12 06:13:27 +01:00
Melanie
3c3ad08868
Merge branch 'master' into careminster-presence-refactor
...
0.7.1CM Dev
2010-06-12 02:46:11 +01:00
Melanie
85d2e21558
Change trunk versio to 0.7.1 Dev
2010-06-12 02:45:21 +01:00
Teravus Ovares (Dan Olivares)
99f2a1c347
* Tweak the StopFlying() method in LLClientView to fabricate a suitable landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f
2010-06-11 21:46:01 -04:00
Melanie
4dd9cf1ce4
Change flavor to 0.7-RC1
2010-06-12 02:44:01 +01:00
Melanie
ae0a7e2c37
Merge branch 'master' into careminster-presence-refactor
2010-06-12 02:19:57 +01:00
Melanie
508bfa1de8
Merge branch 'master' into careminster-presence-refactor
2010-06-12 01:26:55 +01:00
Melanie
c8ed972443
Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet
...
we used to send before slimupdates and explicitly send it
2010-06-12 01:25:25 +01:00
Melanie
6a2e0c707c
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:34:26 +01:00
Melanie
ed38b4a140
Some people don't use Simian. Make the connector respect that it's disabled
...
and not try to send a map tile in that case.
2010-06-12 00:32:54 +01:00
Melanie
836728e5de
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:08:20 +01:00
John Hurliman
b5bc2816fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 15:43:22 -07:00
John Hurliman
d1a324888b
* Added a new method to IMapImageGenerator for getting the map tile before it is JPEG2000 compressed
...
* Aesthetically improved map tile water
* SimianGrid connector now uploads a PNG tile to the AddMapTile API
2010-06-11 15:37:25 -07:00
Melanie
c61e998580
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-11 22:09:24 +01:00
Justin Clark-Casey (justincc)
0dce4f1997
Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
...
This reverts commit 3525195bc9
.
2010-06-11 22:13:36 +01:00
Melanie
694c8ab588
Remove the lastmap stuff from the map module, also remove a bunch of comments
...
that no longer reflect actual conditions
2010-06-11 22:08:43 +01:00
Justin Clark-Casey (justincc)
3525195bc9
Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)
...
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood.
This is in line with other methods that alraedy allow requests via uuid
2010-06-11 21:55:18 +01:00
Justin Clark-Casey (justincc)
8531da37d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 21:18:53 +01:00
Justin Clark-Casey (justincc)
1a16a92a62
create inactive test for iar folders/items merged with existing paths
...
add various helper functions for simplifying test readability
2010-06-11 21:18:09 +01:00
Diva Canto
5d099182c3
Reinstated the check on im.binaryBucket.Length, this time on the local handler for inventory offers.
2010-06-11 13:14:07 -07:00
Melanie
4e34770aba
Merge branch 'master' into careminster-presence-refactor
2010-06-11 20:56:43 +01:00
Diva Canto
556e91d33c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-11 12:48:06 -07:00
Diva Canto
d184fef4dc
Inventory offers and subsequent notifications of acceptance/decline now working across the board.
2010-06-11 12:47:47 -07:00
Melanie
1cfebca48d
Merge branch 'master' into careminster-presence-refactor
2010-06-11 20:35:00 +01:00
Melanie
9318674cdb
Merge branch 'master' into careminster-presence-refactor
2010-06-11 17:54:35 +01:00
Melanie
9648f08dc9
Add the AllowLightShareFunctions example
2010-06-11 17:53:49 +01:00
Melanie
77ef0053f2
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-11 17:52:59 +01:00
Melanie
8a084cb7e1
Remove a company name referecne from the example
2010-06-11 17:52:29 +01:00
Melanie
de8f9e201f
Merge branch 'master' into careminster-presence-refactor
2010-06-11 17:49:12 +01:00
Melanie Thielker
c98b10fc8c
Remove the cm* function namespace
2010-06-11 17:48:41 +01:00
Melanie
b1224c3540
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-11 17:47:34 +01:00