Melanie
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
Melanie Thielker
06661708b4
Add a parameter to prim inventory update to prevent event firing
2010-04-27 02:40:30 +02:00
Melanie
6928ec0240
Add a parameter to prim inventory update to prevent event firing
2010-04-27 00:25:29 +01:00
Diva Canto
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
Diva Canto
2686573b1c
Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that makes the compilation in Windows happy again. Not sure if this is the right dll, Justin -- I grabbed it somewhere from mono 2.4.6 for Windows.
2010-04-26 15:03:47 -07:00
Diva Canto
2ac00b7f96
* Commenting SQLiteNG out of prebuild.xml, because it's making compile fail in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from!
...
* IRegionModule.cs wants to be committed too -- EOF.
2010-04-26 14:52:22 -07:00
Melanie Thielker
81ff5eaba0
Make scripted attachment states work. Finally. Also replace two monitor locks
...
with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
2010-04-25 22:03:35 +02:00
Melanie Thielker
899d521ab4
Use the saved script states
2010-04-24 18:59:34 +02:00
Melanie Thielker
27b3f23ff3
Remove some usings that stopped compilation
2010-04-24 16:53:47 +02:00
Melanie Thielker
71f42f185a
Plumb a data path to initialize an attachment from an alternate source
2010-04-24 16:45:25 +02:00
Justin Clark-Casey (justincc)
15d42d2111
Add instructions for using SQLiteNG to OpenSim.ini and config-include/StandaloneCommon.ini
...
Unfortunately, database settings need to be changed in two places.
2010-04-23 22:06:02 +01:00
Justin Clark-Casey (justincc)
847cc4fceb
remove [DatabaseService] section from OpenSim.ini since this is always present in included configuration files
2010-04-23 21:31:08 +01:00
Justin Clark-Casey (justincc)
10e18f465e
minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
2010-04-23 21:29:09 +01:00
Justin Clark-Casey (justincc)
6e99e5b47a
get region prim saving working properly in SQLiteNG
...
it wasn't working because of debug work that I'd forgotton to take out
2010-04-23 20:56:24 +01:00
Justin Clark-Casey (justincc)
f313d57fa4
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 20:11:26 +01:00
Justin Clark-Casey (justincc)
1b488c2581
dispose of the DbCommand used to execute migrations after we've finished with it rather than within the loop
...
disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway
2010-04-23 20:08:24 +01:00
dahlia
b5ec101cc8
add a comment about deprecating IRegionModule
2010-04-23 12:06:32 -07:00
Justin Clark-Casey
e78f874cfd
put SQLiteNG classes in their own namespace to avoid confusion
2010-04-23 19:40:15 +01:00
Melanie Thielker
56f60a04d9
Add an additional serialization call do the detach procedure. This call is
...
executed only for it's side effects, which are to block until attach(NULL_KEY)
completes, before commencing detachment.
2010-04-23 20:18:34 +02:00
Justin Clark-Casey (justincc)
fcbac43114
minor: correct the assembly information for SQLiteNG
2010-04-23 19:14:43 +01:00
Justin Clark-Casey (justincc)
5ee77886ac
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 19:05:32 +01:00
Justin Clark-Casey (justincc)
e84cc2f9db
Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll
...
Include the library so that Windows builds correctly
It appears that Windows is okay with either SQLite or SQLiteNG
Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite
2010-04-23 18:56:50 +01:00
Justin Clark-Casey (justincc)
a23bebdc0f
Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will shortly be changed to work under mono 2.6 and above
2010-04-23 17:17:15 +01:00
Melanie Thielker
31e0704c8d
Remove debug output, the culprit has been identified
2010-04-23 17:48:50 +02:00
Melanie Thielker
780630d7c0
Fix a nullref in attachment handling. Add some debug to find the attachment
...
state issue
2010-04-23 14:41:20 +02:00
John Hurliman
8692ac53f5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-22 18:56:06 -07:00
John Hurliman
67990ea7e4
* Better error logging for failed SimianGrid web service calls
2010-04-22 18:55:31 -07:00
Melanie
ebcc9874d4
Insert a ROLLBACK command on migration step failure. This ensures that
...
updating the Migrations table will not occur in a partial transaction, which
would be auto-rolled-back later.
2010-04-22 17:45:03 +01:00
Diva Canto
e33209fe5b
Sanitized parsing of floats (x, y, z location) for Culture.
2010-04-22 08:47:47 -07:00
Diva Canto
c9da66728a
Renamed OpenSim.Server.exe to Robust.exe and corresponding .ini's and config.
2010-04-22 07:25:32 -07:00
Melanie
af778f09d5
Merge branch 'master' into careminster-presence-refactor
2010-04-21 19:51:17 +01:00
Melanie
459323a931
Make the detection cone in attachments face in the direction of the avatar,
...
not the relative rotation of the attachment towards the avatar.
2010-04-21 19:44:19 +01:00
Justin Clark-Casey (justincc)
50f327ef5c
minor: change a comment and replace some magic numbers with the AssetType enum
2010-04-19 21:34:42 +01:00
Justin Clark-Casey (justincc)
6b963e73d9
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-19 21:28:30 +01:00
Justin Clark-Casey (justincc)
524a2a9e26
Make the "notecard saved" text appear in the saver rather than the notecard owner, if the notecard is saved by a permitted group member
...
This means moving the alert up to a place where the IClientAPI is available.
One can also argue that such client messages shouldn't be sent directly from the scene data model
2010-04-19 21:25:59 +01:00
Justin Clark-Casey (justincc)
da83ee28be
If a transfer request is received for a task inventory item asset, then route the permissions request through the existing CanEditScript() and CanEditNotecard() methods.
...
This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions.
Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts.
For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code
This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts
2010-04-19 21:02:36 +01:00
Justin Clark-Casey (justincc)
855eda844f
log problems when an asset request through the UDP TransferRequest channel goes wrong
2010-04-19 20:06:55 +01:00
Melanie Thielker
de63b60748
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 19:27:45 +02:00
Melanie Thielker
80024c023a
Remove the event trigger for the attach event from the attachment module.
...
The script engine already triggers this internally.
2010-04-19 18:44:21 +02:00
Melanie Thielker
af3e477e4b
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 17:28:43 +01:00
Melanie
d2e4f2d376
Merge branch 'master' into careminster-presence-refactor
2010-04-19 15:33:20 +01:00
Melanie
3e63ce6d9d
Make script asset fetches synchronous. Script instantiation synchronization
...
will not work if the instance is not created when the method returns.
2010-04-19 15:29:35 +01:00
Melanie
a89208b465
Stopgap measure. Disable the recent script startup changes until I can cure the
...
race condition.
2010-04-19 14:14:31 +01:00
Melanie Thielker
1667a29c88
And some more rez modes that weren't covered before
2010-04-19 12:54:33 +02:00
Melanie Thielker
689b647790
And some more rez modes that weren't covered before
2010-04-19 10:54:41 +01:00
Melanie
efa7873ae1
Merge branch 'master' into careminster-presence-refactor
2010-04-19 10:44:01 +01:00
Melanie
b39db7e9e4
Also enable scripts rezzed into prims
2010-04-19 10:43:25 +01:00
Melanie
65079b1106
Merge branch 'careminster' into careminster-presence-refactor
2010-04-19 07:00:51 +01:00
Melanie
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
Melanie
f8d49e0a30
Merge branch '0.6.9-post-fixes' into careminster
2010-04-19 06:32:29 +01:00