bfff39c4c0
Merge branch 'master' into 0.7-post-fixes
2010-06-29 14:25:13 -07:00
d06b977ed1
Remove the override from DeletToInventory in HGInventoryAccessModule. This may be causing the infinite loop, not sure.
2010-06-29 14:21:48 -07:00
f4b90b52db
stop exceptions in setting and getting state from propogating since they aren't fatal to operations
...
this will hopefully stop "save oar" from failing if a script asset is corrupt
2010-06-29 21:03:58 +01:00
5d11833ae1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-29 20:36:36 +01:00
94cb6fc916
stop exceptions in setting and getting state from propogating since they aren't fatal to operations
...
this will hopefully stop "save oar" from failing if a script asset is corrupt
2010-06-29 21:08:09 +01:00
5964084d25
Fix a nullref on autoreturn
2010-06-29 20:36:17 +01:00
c607e6f3b8
Revert "don't report the null uuid as a missing asset on saving oars/iars"
...
This reverts commit 5ce119174e
2010-06-29 20:30:22 +01:00
6f1b351cf4
Revert "don't report the null uuid as a missing asset on saving oars/iars"
...
This reverts commit 5ce119174e
2010-06-29 20:28:48 +01:00
dcb9da8495
This is RC2. *** Changed the MySql driver back to the old one.*** Removed Old Guids from connection strings.
...
Merged master onto this branch.
2010-06-29 06:55:34 -07:00
1cd9118c7a
Merge branch 'master' into 0.7-post-fixes
...
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
2010-06-29 06:37:39 -07:00
cf15558c9e
This file wants to be committed.
2010-06-29 06:25:12 -07:00
fa3f448324
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-29 04:40:02 -07:00
08e3389790
Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase".
2010-06-29 04:38:15 -07:00
9fde9085a0
Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken comments in InventoryAccessModule.
2010-06-29 02:07:10 -07:00
621195e4f1
Thanks Micheil Merlin for Mantis #4784 : [PATCH] llRotBetween does not return correct rotations for a 180 degree angle between vectors
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-06-28 17:33:47 -07:00
d123350164
One more bug fix in FriendsModule: GrantRights. One of the caches was not being updated.
2010-06-28 16:04:12 -07:00
20fc35399b
Fixes mantis #4815 and #4812
2010-06-28 14:10:22 -07:00
0a82d10fc4
Change the way IRegionModule us referenced by IEmailModule to
...
allow later conversion to new style
2010-06-28 03:14:05 +01:00
85a9c305a2
Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never
...
used, but made for a very mispleading read of the code in the callers.
2010-06-28 01:43:26 +01:00
4cdda2cae9
Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and
...
nonworking ownership assignment in SOG, which messed things up before.
No longer trust the client to send the ID of the person something is copied
as, since it allows to run a script with someone else's permissions. Properly
adjust inventory ownership and perms.
2010-06-28 01:36:40 +01:00
1499fd85c4
Fix a simian compiler warning
2010-06-27 21:02:03 +01:00
660a560d3b
Make drag copy and copy-on-ray handle friends list perms properly
2010-06-27 20:59:51 +01:00
6cf0b8f6fe
Add command-script to the Robust console
2010-06-27 13:28:27 -07:00
3dbc736049
Addresses mantis #4789 . Not really a fix, because the event is harmless anyway. Just shouldn't happen normally.
2010-06-27 13:23:51 -07:00
a61d817978
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-27 13:07:44 -07:00
7868f1f650
Fixed Robust.32BitLaunch.exe
2010-06-27 13:06:39 -07:00
76d2f0f68e
Same patch as before but for SQLite.
2010-06-27 12:40:17 -07:00
b0129b35f8
Added checks to XInventory DB layer to truncate names and descriptions.
2010-06-27 12:37:16 -07:00
3612a5252b
Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.
...
Preserve "Anyone can move" flag in most cases.
2010-06-27 20:23:33 +01:00
121ba7e95c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-27 20:05:29 +01:00
205d2496f6
Fix permission propagation to prevent permanently locked objects from being
...
created.
2010-06-27 20:04:39 +01:00
5ce119174e
don't report the null uuid as a missing asset on saving oars/iars
2010-06-25 21:49:13 +01:00
a4a808818f
don't report the null uuid as a missing asset on saving oars/iars
2010-06-25 21:48:19 +01:00
0f3d9e17c6
minor: fix spelling mistake interupt -> interrupt in migrations
...
This is for mantis 4783
2010-06-25 21:20:47 +01:00
d399bd3eb7
minor: fix spelling mistake interupt -> interrupt in migrations
...
This is for mantis 4783
2010-06-25 21:18:52 +01:00
4a5979c311
minor: remove some mono compiler warnings
2010-06-25 21:09:15 +01:00
77fc48f2f9
fix web request exception reporting properly this time
2010-06-25 20:59:24 +01:00
c7e7cb04a3
fix web request exception reporting properly this time
2010-06-25 20:57:38 +01:00
8629ba80bf
Revert "Report http server onRequest() exception properly."
...
This reverts commit c09451a034
2010-06-25 20:51:21 +01:00
c09451a034
Report http server onRequest() exception properly.
2010-06-25 19:11:22 +01:00
24785e82a5
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:57:58 +01:00
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
2c4df19805
minor: Move log information about SYSTEMIP to the place where it's resolved
2010-06-25 18:29:02 +01:00
7488f61289
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-25 05:15:54 -07:00
977eccf127
This file wants to be committed. Line endings mess up.
2010-06-25 05:15:26 -07:00
31b7279095
* SimianAssetServiceConnector Delete() was expecting the wrong type of response, reporting false errors
...
* Fixed a typo in a WebUtil error message
2010-06-24 13:44:34 -07:00
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
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
e22eddeee6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-23 21:15:07 +01:00
c404c5fb54
Thank you, Snoopy, for a patch to reduce sim script startup CPU usage
2010-06-23 21:14:28 +01:00
Diva Canto