Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-03 | 7 | -13/+43 |
|\ | |||||
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-09-03 | 3 | -8/+8 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-03 | 9 | -32/+169 |
| |\ | |||||
| | * | Last+2 tweak | Diva Canto | 2010-09-03 | 1 | -1/+1 |
| | | | |||||
| | * | Last+1 tweak. | Diva Canto | 2010-09-03 | 1 | -1/+1 |
| | | | |||||
| | * | One last tweak, hopefully. | Diva Canto | 2010-09-03 | 1 | -2/+2 |
| | | | |||||
| | * | Another tweak. Sux^2 | Diva Canto | 2010-09-03 | 1 | -2/+2 |
| | | | |||||
| | * | More tweaks related to my previous commit. Tweaks sux. | Diva Canto | 2010-09-03 | 2 | -3/+3 |
| | | | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-03 | 4 | -28/+38 |
| | |\ | |||||
| | * | | Fix an issue with rezzing scripted objects. | Melanie Thielker | 2010-09-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | llRot2Euler Tests | Micheil Merlin | 2010-09-03 | 1 | -0/+30 |
| | | | | |||||
* | | | | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors ↵ | John Hurliman | 2010-09-03 | 9 | -160/+83 |
| |_|/ |/| | | | | | | | | | | | | | | to handle initialization as graceful as possible with the current broken way region module initialization is done * Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side) | ||||
* | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-09-02 | 27 | -323/+616 |
|\ \ \ | | |/ | |/| | |||||
| * | | Remove commented code and the comment, as the change has proven out | Melanie Thielker | 2010-09-02 | 1 | -3/+0 |
| | | | |||||
| * | | Experimentally comment the sending of unbaked avatars | Melanie Thielker | 2010-09-02 | 1 | -1/+3 |
| | | | |||||
| * | | Show when appearance is sent to an avatar to help track down failure | Melanie Thielker | 2010-09-02 | 1 | -0/+1 |
| | | | | | | | | | | | | \to display avatars | ||||
| * | | Implement UploadBakedTexture cap | Melanie Thielker | 2010-09-02 | 1 | -0/+105 |
| | | | |||||
| * | | Fix cast issue | Melanie | 2010-09-02 | 1 | -1/+1 |
| | | | |||||
| * | | Allow increasing the version in system folders | Melanie | 2010-09-02 | 1 | -1/+7 |
| | | | |||||
| * | | Update: Allow the version to increase only | Melanie | 2010-09-02 | 1 | -1/+2 |
| | | | |||||
| * | | Disallow modification of system folders. Prevent changing the type of folders | Melanie | 2010-09-02 | 1 | -1/+16 |
| |/ | | | | | | | and prevent resetting the version number | ||||
| * | Fix sqlite migration problems by moving migrations in 019_RegionStore.sql ↵ | Justin Clark-Casey (justincc) | 2010-09-01 | 3 | -14/+14 |
| | | | | | | | | | | | | and 020 into RegionStore.migrations This shows that panda is still not running the sqlite database tests since this change fixes the test failure in that area when "nant test" is executed locally | ||||
| * | refactor: move SOG.AttachToAgent() into AttachmentsModule | Justin Clark-Casey (justincc) | 2010-09-01 | 2 | -78/+74 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-01 | 4 | -4/+4 |
| |\ | |||||
| | * | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 4 | -4/+4 |
| | | | | | | | | | | | | script state enum to reflect recent changes. | ||||
| * | | refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments ↵ | Justin Clark-Casey (justincc) | 2010-08-31 | 1 | -9/+5 |
| | | | | | | | | | | | | rather than filter sp.Attachments list directly | ||||
| * | | Add ScenePresence.GetAttachments(uint attachmentPoint) | Justin Clark-Casey (justincc) | 2010-08-31 | 1 | -0/+21 |
| | | | |||||
| * | | reinsert functionality to debug log more levels of incoming and outgoing ↵ | Justin Clark-Casey (justincc) | 2010-08-31 | 3 | -11/+50 |
| |/ | | | | | | | | | | | | | client protocol packets These levels correspond to packets that one isn't usually interested in when debugging (e.g. regular outgoing SimStats packets) This is equivalent to what we had a year ago before it was removed. It's extremely crude since it doesn't allow one to pick individual clients or packets. However, it can still be useful when debugging packet race conditions. | ||||
| * | minor: Add some method doc to BaseHttpServer.HandleRequest() | Justin Clark-Casey (justincc) | 2010-08-30 | 1 | -2/+8 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-30 | 13 | -205/+311 |
| |\ | |||||
| | * | Fix a casting operation to use ToString() | Melanie | 2010-08-30 | 1 | -1/+1 |
| | | | |||||
| | * | Implements parcel media setting persistence and packet / CAPS handling | Jonathan Freedman | 2010-08-30 | 13 | -205/+311 |
| | | | | | | | | | | | | | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Report exception message as well as stack trace if a region fails to ↵ | Justin Clark-Casey (justincc) | 2010-08-30 | 1 | -1/+3 |
| |/ | | | | | | | register with the grid service in grid mode | ||||
* | | Quick fix for making global references for gatekeepers that are not ↵ | Diva Canto | 2010-09-02 | 4 | -28/+38 |
|/ | | | | domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now. | ||||
* | Replace hardcoded 0 with KickFlags provided by the client. | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -1/+1 |
| | | | | This finally completes http://opensimulator.org/mantis/view.php?id=4356 where this change had been accidentally removed. Thanks Revolution. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -0/+9 |
|\ | |||||
| * | Addresses mantis #4991 -- HG between two regions with the same map ↵ | Diva Canto | 2010-08-27 | 1 | -0/+9 |
| | | | | | | | | coordinates fails with no warning | ||||
* | | very minor log message and var name tweaking for iar saving | Justin Clark-Casey (justincc) | 2010-08-28 | 2 | -5/+8 |
|/ | |||||
* | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 9 | -371/+384 |
| | |||||
* | minor: reduce log chattiness of "load iar" for IARs with lots of folders | Justin Clark-Casey (justincc) | 2010-08-27 | 1 | -1/+1 |
| | |||||
* | allow inventory path specified in "load iar" to start with a / (e.g. ↵ | Justin Clark-Casey (justincc) | 2010-08-27 | 3 | -13/+45 |
| | | | | /Objects is now valid where it wasn't before) | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-27 | 2 | -13/+40 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-26 | 14 | -131/+193 |
| |\ | |||||
| | * | More on mantis #4985 | Diva Canto | 2010-08-26 | 1 | -6/+14 |
| | | | |||||
| | * | Addresses mantis #4985 -- exceptions in DataSnapshot | Diva Canto | 2010-08-26 | 1 | -7/+23 |
| | | | |||||
| * | | Send a null result search packet when no results are passsed in | Melanie | 2010-08-26 | 1 | -1/+4 |
| | | | |||||
* | | | refactor: Make IAR tests set up standard iar for loading | Justin Clark-Casey (justincc) | 2010-08-27 | 2 | -48/+71 |
| |/ |/| | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -3/+12 |
|\ \ | |||||
| * | | Addresses mantis #4984 -- Datasnapshot exceptions. | Diva Canto | 2010-08-26 | 1 | -3/+12 |
| |/ | |||||
* | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -3/+4 |
| | |