Tom Grimshaw
|
30397b6fbc
|
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
|
2010-06-25 14:26:07 -07:00 |
Tom Grimshaw
|
96e649189f
|
Add two events: OnAttachToBackup and OnDetachFromBackup.
|
2010-06-25 14:25:39 -07:00 |
Justin Clark-Casey (justincc)
|
a4a808818f
|
don't report the null uuid as a missing asset on saving oars/iars
|
2010-06-25 21:48:19 +01:00 |
Justin Clark-Casey (justincc)
|
d399bd3eb7
|
minor: fix spelling mistake interupt -> interrupt in migrations
This is for mantis 4783
|
2010-06-25 21:18:52 +01:00 |
Justin Clark-Casey (justincc)
|
4a5979c311
|
minor: remove some mono compiler warnings
|
2010-06-25 21:09:15 +01:00 |
Tom Grimshaw
|
8daa149c36
|
Remove the prepending slash from the default git repo name
|
2010-06-25 13:03:00 -07:00 |
Tom Grimshaw
|
3ef70b55e9
|
Whoops, enabled = true not enabled = 1
|
2010-06-25 12:58:13 -07:00 |
Justin Clark-Casey (justincc)
|
c7e7cb04a3
|
fix web request exception reporting properly this time
|
2010-06-25 20:57:38 +01:00 |
Tom Grimshaw
|
e0d533dc4e
|
Add [Git] section to OpenSim.ini.example for Gitminster
|
2010-06-25 12:55:02 -07:00 |
Justin Clark-Casey (justincc)
|
8629ba80bf
|
Revert "Report http server onRequest() exception properly."
This reverts commit c09451a034 .
|
2010-06-25 20:51:21 +01:00 |
Melanie
|
dc9e9931eb
|
Merge branch 'master' into careminster-presence-refactor
|
2010-06-25 20:26:48 +01:00 |
Tom Grimshaw
|
94ece2789d
|
Add some libraries for XGitminster
|
2010-06-25 12:21:24 -07:00 |
Justin Clark-Casey (justincc)
|
c09451a034
|
Report http server onRequest() exception properly.
|
2010-06-25 19:11:22 +01:00 |
Justin Clark-Casey (justincc)
|
52b711af82
|
stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent isn't present in the presence dictionary
the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place
|
2010-06-25 18:55:20 +01:00 |
Justin Clark-Casey (justincc)
|
2c4df19805
|
minor: Move log information about SYSTEMIP to the place where it's resolved
|
2010-06-25 18:29:02 +01:00 |
Tom Grimshaw
|
3101d53064
|
Make "Allow other residents to edit terrain" default to FALSE
|
2010-06-25 05:25:41 -07:00 |
Diva Canto
|
7488f61289
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2010-06-25 05:15:54 -07:00 |
Diva Canto
|
977eccf127
|
This file wants to be committed. Line endings mess up.
|
2010-06-25 05:15:26 -07:00 |
Melanie Thielker
|
afff74a835
|
Add DwellModule interface
|
2010-06-25 01:44:17 +02:00 |
Melanie Thielker
|
8a0ec60c8f
|
Unhook the dwell request from the land module (and therefore local storage)
|
2010-06-25 01:41:00 +02:00 |
John Hurliman
|
6848465ae2
|
* SimianAssetServiceConnector Delete() was expecting the wrong type of response, reporting false errors
* Fixed a typo in a WebUtil error message
|
2010-06-24 13:43:38 -07:00 |
Melanie Thielker
|
f186882c0f
|
Also make prims send the proper position. I hate it when people comment
out things just because they're "not yet used". Grrrr.
|
2010-06-24 20:51:04 +02:00 |
Melanie Thielker
|
cbca58401a
|
Add the object owner UUID into the binary bucket of object to user IM
|
2010-06-24 20:46:24 +02:00 |
Melanie Thielker
|
2cc1f14b0c
|
Replace the imSessionID, which is useless out of context, with the scope id
in saved IMs
|
2010-06-24 19:37:02 +02:00 |
Melanie Thielker
|
b012e963d7
|
New viewers don't set the "save offline IM" flag anymore. Set it serverside
so messages get saved
|
2010-06-24 18:48:40 +02:00 |
Melanie Thielker
|
6c37a02c0f
|
bug fix. 0,0 is a vlid sim coordinate
|
2010-06-24 06:02:44 +02:00 |
Melanie
|
5a071dc798
|
Move loading of parcels to before script start. Scripts using parcel functions
can fail if no land is loaded
|
2010-06-24 03:24:38 +01:00 |
Melanie Thielker
|
9d03271265
|
And another
|
2010-06-24 03:43:50 +02:00 |
Melanie
|
e94cf3d9b7
|
And another conflict
|
2010-06-24 03:35:42 +01:00 |
Melanie
|
e93853623b
|
Merge branch 'master' into careminster-presence-refactor
|
2010-06-24 03:30:11 +01:00 |
Melanie
|
e22eddeee6
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-06-23 21:15:07 +01:00 |
Melanie
|
c404c5fb54
|
Thank you, Snoopy, for a patch to reduce sim script startup CPU usage
|
2010-06-23 21:14:28 +01:00 |
Justin Clark-Casey (justincc)
|
1719dc9a9b
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2010-06-23 01:22:42 +01:00 |
Justin Clark-Casey (justincc)
|
8c56f04f82
|
add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch to OpenSim.ini.exmaple
Also tidies up and comments some existing entries
|
2010-06-23 01:21:49 +01:00 |
Melanie
|
ce6fbd9680
|
Merge branch 'master' into careminster-presence-refactor
|
2010-06-22 23:40:59 +01:00 |
Melanie
|
7db5262e35
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-06-22 23:40:12 +01:00 |
John Hurliman
|
c96a6940a9
|
Line ending fix
|
2010-06-22 16:11:36 -07:00 |
John Hurliman
|
1e1485de5b
|
* Fixed SimianGrid map tile uploads not having any objects in the images
|
2010-06-22 16:09:30 -07:00 |
Melanie Thielker
|
68551675df
|
Guard prioritizer agains null values as those produced by a bullet dying
before it can be updated
|
2010-06-22 23:39:39 +01:00 |
Melanie Thielker
|
854a8b9172
|
Security fix: Allow only textures to be fetched using HTTP texture cap
|
2010-06-22 23:39:25 +01:00 |
Melanie
|
317ac50a97
|
Merge branch 'master' into careminster-presence-refactor
|
2010-06-22 23:38:56 +01:00 |
Melanie Thielker
|
5c02fb435d
|
Security fix: Allow only textures to be fetched using HTTP texture cap
|
2010-06-22 17:35:00 +02:00 |
Melanie Thielker
|
962dade155
|
Cause collisions with the avatar to be sent to attachments. Currently
ignores collision filter. Physics collisions are still dodgy, so we
don't get the events we should be getting.
|
2010-06-22 04:04:59 +02:00 |
Melanie Thielker
|
3428196631
|
Guard prioritizer agains null values as those produced by a bullet dying
before it can be updated
|
2010-06-22 02:33:20 +02:00 |
Melanie Thielker
|
3ea4e5ccbe
|
Correctly update the LastSeen field
|
2010-06-21 23:26:27 +02:00 |
Melanie Thielker
|
53905cf919
|
Bump the migration version, ot it would never happen
|
2010-06-21 22:15:33 +02:00 |
Melanie Thielker
|
ab023c6a29
|
Fix build break
|
2010-06-21 18:06:46 +02:00 |
Melanie Thielker
|
9fd45406be
|
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
|
2010-06-21 17:06:59 +02:00 |
Melanie Thielker
|
973537f819
|
Ensure no UUID.Zero region ID is ever written to presence. Add a Migration
to add a LastSeen field of type "Timestamp" to Presence for MySQL
|
2010-06-21 17:06:05 +02:00 |
Tom Grimshaw
|
9d251b1dc5
|
Fix the StandUp position to calculate as if we're still using the child prim id.
|
2010-06-20 15:57:01 -07:00 |