Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 0.7-post-fixes | Diva Canto | 2010-06-29 | 2 | -6/+19 |
|\ | |||||
| * | Remove the override from DeletToInventory in HGInventoryAccessModule. This ↵ | Diva Canto | 2010-06-29 | 1 | -1/+2 |
| | | | | | | | | may be causing the infinite loop, not sure. | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-29 | 11 | -46/+133 |
| |\ | |||||
| | * | stop exceptions in setting and getting state from propogating since they ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -8/+31 |
| | | | | | | | | | | | | | | | | | | aren't fatal to operations this will hopefully stop "save oar" from failing if a script asset is corrupt | ||||
| | * | Revert "don't report the null uuid as a missing asset on saving oars/iars" | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 5ce119174e03715bfc61f7864bd3e7182c5d21ea. This change led to infinite timeout since the expected number of assets no longer matched requests. Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient | ||||
| * | | Fix a nullref on autoreturn | Melanie | 2010-06-29 | 1 | -5/+17 |
| | | | |||||
* | | | stop exceptions in setting and getting state from propogating since they ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -8/+31 |
| | | | | | | | | | | | | | | | | | | aren't fatal to operations this will hopefully stop "save oar" from failing if a script asset is corrupt | ||||
* | | | Revert "don't report the null uuid as a missing asset on saving oars/iars" | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 5ce119174e03715bfc61f7864bd3e7182c5d21ea. This change led to infinite timeout since the expected number of assets no longer matched requests. Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient | ||||
* | | | This is RC2. *** Changed the MySql driver back to the old one.*** Removed ↵ | Diva Canto | 2010-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Old Guids from connection strings. Merged master onto this branch. | ||||
* | | | Merge branch 'master' into 0.7-post-fixes | Diva Canto | 2010-06-29 | 31 | -115/+284 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | ||||
| * | | This file wants to be committed. | Diva Canto | 2010-06-29 | 1 | -70/+70 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-06-29 | 1 | -18/+71 |
| |\ \ | |||||
| | * | | Thanks Micheil Merlin for Mantis #4784: [PATCH] llRotBetween does not return ↵ | dahlia | 2010-06-28 | 1 | -18/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | correct rotations for a 180 degree angle between vectors Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
| * | | | Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG ↵ | Diva Canto | 2010-06-29 | 3 | -4/+11 |
| | | | | | | | | | | | | | | | | xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase". | ||||
| * | | | Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken ↵ | Diva Canto | 2010-06-29 | 3 | -12/+7 |
| |/ / | | | | | | | | | | comments in InventoryAccessModule. | ||||
| * | | One more bug fix in FriendsModule: GrantRights. One of the caches was not ↵ | Diva Canto | 2010-06-28 | 1 | -0/+7 |
| | | | | | | | | | | | | being updated. | ||||
| * | | Fixes mantis #4815 and #4812 | Diva Canto | 2010-06-28 | 1 | -1/+5 |
| |/ | |||||
| * | Change the way IRegionModule us referenced by IEmailModule to | Melanie Thielker | 2010-06-28 | 2 | -2/+2 |
| | | | | | | | | allow later conversion to new style | ||||
| * | Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never | Melanie Thielker | 2010-06-28 | 4 | -6/+6 |
| | | | | | | | | used, but made for a very mispleading read of the code in the callers. | ||||
| * | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and | Melanie Thielker | 2010-06-28 | 3 | -20/+6 |
| | | | | | | | | | | | | | | 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. | ||||
| * | Fix a simian compiler warning | Melanie | 2010-06-27 | 1 | -1/+1 |
| | | |||||
| * | Make drag copy and copy-on-ray handle friends list perms properly | Melanie Thielker | 2010-06-27 | 1 | -0/+22 |
| | | |||||
| * | Add command-script to the Robust console | Robert Adams | 2010-06-27 | 1 | -0/+41 |
| | | |||||
| * | Addresses mantis #4789. Not really a fix, because the event is harmless ↵ | Diva Canto | 2010-06-27 | 1 | -1/+7 |
| | | | | | | | | anyway. Just shouldn't happen normally. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-06-27 | 1 | -11/+12 |
| |\ | |||||
| | * | Fix more perms weirdness. Preserve "Locked" status across gives and rez/take. | Melanie | 2010-06-27 | 1 | -8/+9 |
| | | | | | | | | | | | | Preserve "Anyone can move" flag in most cases. | ||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-27 | 2 | -1/+17 |
| | |\ | |||||
| | * | | Fix permission propagation to prevent permanently locked objects from being | Melanie | 2010-06-27 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | created. | ||||
| * | | | Fixed Robust.32BitLaunch.exe | Diva Canto | 2010-06-27 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | Same patch as before but for SQLite. | Diva Canto | 2010-06-27 | 1 | -0/+8 |
| | | | |||||
| * | | Added checks to XInventory DB layer to truncate names and descriptions. | Diva Canto | 2010-06-27 | 1 | -1/+9 |
| |/ | |||||
| * | don't report the null uuid as a missing asset on saving oars/iars | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -3/+5 |
| | | |||||
| * | minor: fix spelling mistake interupt -> interrupt in migrations | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -6/+3 |
| | | | | | | | | This is for mantis 4783 | ||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-06-25 | 2 | -14/+14 |
| | | |||||
| * | fix web request exception reporting properly this time | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| | | |||||
| * | Revert "Report http server onRequest() exception properly." | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| | | | | | | | | This reverts commit c09451a034babe6de7a2ffec44852a19946ec76d. | ||||
| * | Report http server onRequest() exception properly. | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| | | |||||
| * | stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent ↵ | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -6/+7 |
| | | | | | | | | | | | | 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 | ||||
| * | minor: Move log information about SYSTEMIP to the place where it's resolved | Justin Clark-Casey (justincc) | 2010-06-25 | 2 | -10/+14 |
| | | |||||
| * | * SimianAssetServiceConnector Delete() was expecting the wrong type of ↵ | John Hurliman | 2010-06-24 | 2 | -8/+23 |
| | | | | | | | | | | | | response, reporting false errors * Fixed a typo in a WebUtil error message | ||||
| * | Move loading of parcels to before script start. Scripts using parcel functions | Melanie | 2010-06-24 | 1 | -3/+3 |
| | | | | | | | | can fail if no land is loaded | ||||
| * | Thank you, Snoopy, for a patch to reduce sim script startup CPU usage | Melanie | 2010-06-23 | 1 | -10/+12 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-22 | 1 | -14/+14 |
| |\ | |||||
| | * | Line ending fix | John Hurliman | 2010-06-22 | 1 | -14/+14 |
| | | | |||||
| * | | Guard prioritizer agains null values as those produced by a bullet dying | Melanie Thielker | 2010-06-22 | 1 | -0/+3 |
| | | | | | | | | | | | | before it can be updated | ||||
| * | | Security fix: Allow only textures to be fetched using HTTP texture cap | Melanie Thielker | 2010-06-22 | 1 | -0/+12 |
| |/ | |||||
| * | * Fixed SimianGrid map tile uploads not having any objects in the images | John Hurliman | 2010-06-22 | 2 | -4/+30 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-19 | 1 | -6/+16 |
| |\ | |||||
| | * | fix faulty profile cut parameter checking in llSetPrimitiveParams() - see ↵ | dahlia | 2010-06-19 | 1 | -6/+16 |
| | | | | | | | | | | | | Mantis #4510 | ||||
| * | | Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql" | Melanie | 2010-06-19 | 1 | -7/+0 |
| |/ | | | | | | | | | | | Didn't do what it said on the package! This reverts commit 8643db3ef0c4dca709d85fc37240a18fd9049520. |