Commit Graph

14052 Commits (a0eddfcf61f89e9b8355a92fa8a5dd6e93dfe529)

Author SHA1 Message Date
Justin Clark-Casey (justincc) d4b572d2a5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-03 23:29:59 +01:00
Justin Clark-Casey (justincc) 63617c79d8 minor: remove mono compiler warnings 2010-09-03 23:29:39 +01:00
John Hurliman 1e552e88e8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-03 14:50:42 -07:00
John Hurliman fc062a23af Make SimianFriendsServiceConnector initialize like the other connectors and gracefully handle the case where it is loaded but disabled #monoaddinslol 2010-09-03 14:50:26 -07:00
Justin Clark-Casey (justincc) b8da15c104 In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one
This is a patch from http://opensimulator.org/mantis/view.php?id=4973.  Thanks randomhuman
2010-09-03 22:38:40 +01:00
Justin Clark-Casey (justincc) 9b95bd259f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-03 22:27:01 +01:00
Justin Clark-Casey (justincc) fe63fad394 minor: remove mono compiler warning 2010-09-03 22:26:15 +01:00
John Hurliman 83f6550bcc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-03 13:37:30 -07:00
John Hurliman aadbffffb1 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-03 13:36:59 -07:00
John Hurliman 4f79143f3f * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors 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)
2010-09-03 13:36:35 -07:00
Justin Clark-Casey (justincc) d6deebdd63 Add another variant of password hash construction to SimianAuthenticationServiceConnector.CheckPassword()
This might be unique to the inventory archiver password check, though at the time it was written, hash construction there should have been identical to other parts of opensim
This is from patch http://opensimulator.org/mantis/view.php?id=4983.  Thanks cmickeyb.
2010-09-03 21:34:31 +01:00
Justin Clark-Casey (justincc) 8d2e8b7d5c minor: remove mono compiler warnings 2010-09-03 21:28:57 +01:00
Justin Clark-Casey (justincc) 71c0fc10df Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-03 21:14:23 +01:00
Micheil Merlin 8daea4d7c0 llRot2Euler Tests 2010-09-03 21:11:13 +01:00
Diva Canto 0a0f38b23c Last+2 tweak 2010-09-03 10:31:16 -07:00
Diva Canto a5cce8d6d7 Last+1 tweak. 2010-09-03 10:13:41 -07:00
Diva Canto 5bbf793f9e One last tweak, hopefully. 2010-09-03 10:01:18 -07:00
Diva Canto 77384eb28b Another tweak. Sux^2 2010-09-03 09:26:33 -07:00
Diva Canto 85e9160552 More tweaks related to my previous commit. Tweaks sux. 2010-09-03 09:02:08 -07:00
Melanie 18213d26ec Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-09-03 03:27:47 +01:00
Melanie Thielker 17a26c3701 Fix an issue with rezzing scripted objects. 2010-09-03 03:27:26 +01:00
Diva Canto 21c5377af9 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-09-02 16:36:43 -07:00
Diva Canto d96f5fa57d Quick fix for making global references for gatekeepers that are not domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now. 2010-09-02 16:36:05 -07:00
Melanie Thielker 1c8bc9b7b6 Remove commented code and the comment, as the change has proven out 2010-09-02 21:02:09 +01:00
Melanie Thielker 7720419fc7 Experimentally comment the sending of unbaked avatars 2010-09-02 20:17:49 +01:00
Melanie Thielker ed72396d9b Show when appearance is sent to an avatar to help track down failure
\to display avatars
2010-09-02 19:59:12 +01:00
Melanie Thielker 7128e1a4ba Implement UploadBakedTexture cap 2010-09-02 16:20:44 +01:00
Melanie bbdf6cab50 Fix cast issue 2010-09-02 00:20:57 +01:00
Melanie 203b7de266 Allow increasing the version in system folders 2010-09-02 00:04:17 +01:00
Melanie 7efe7feef5 Update: Allow the version to increase only 2010-09-02 00:02:07 +01:00
Melanie 93edc75147 Disallow modification of system folders. Prevent changing the type of folders
and prevent resetting the version number
2010-09-02 00:00:54 +01:00
Justin Clark-Casey (justincc) b9db495d91 Fix sqlite migration problems by moving migrations in 019_RegionStore.sql 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
2010-09-01 22:06:56 +01:00
Justin Clark-Casey (justincc) 6cbf66827b refactor: move SOG.AttachToAgent() into AttachmentsModule 2010-09-01 01:11:52 +01:00
Justin Clark-Casey (justincc) c947a67b23 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-01 00:17:23 +01:00
Melanie Thielker c47de94263 Adjust the "Magic numbers" we use because we can't reference the actual
script state enum to reflect recent changes.
2010-08-31 22:36:46 +01:00
Justin Clark-Casey (justincc) 01276ef433 refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments rather than filter sp.Attachments list directly 2010-08-31 22:22:45 +01:00
Justin Clark-Casey (justincc) 9c1c378aa1 Add ScenePresence.GetAttachments(uint attachmentPoint) 2010-08-31 22:16:23 +01:00
Justin Clark-Casey (justincc) b8c58e5f9f reinsert functionality to debug log more levels of incoming and outgoing 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.
2010-08-31 18:27:10 +01:00
Justin Clark-Casey (justincc) 7b03cb09e4 minor: Add some method doc to BaseHttpServer.HandleRequest() 2010-08-30 22:33:45 +01:00
Justin Clark-Casey (justincc) dd14c539af Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-08-30 21:24:08 +01:00
Justin Clark-Casey (justincc) 3cd7761d65 Report exception message as well as stack trace if a region fails to register with the grid service in grid mode 2010-08-30 21:23:19 +01:00
Melanie eefb207c1b Fix a casting operation to use ToString() 2010-08-30 02:10:11 +01:00
Melanie 0d6c2afce6 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-08-30 02:08:48 +01:00
Jonathan Freedman 0a83fde85c Implements parcel media setting persistence and packet / CAPS handling
properly for the new media settings.

Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 02:07:55 +01:00
Jonathan Freedman 4b2e3bd6c3 local commit with parcel media bits
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 01:59:50 +01:00
Justin Clark-Casey (justincc) 374807d194 Replace hardcoded 0 with KickFlags provided by the client.
This finally completes http://opensimulator.org/mantis/view.php?id=4356 where this change had been accidentally removed.  Thanks Revolution.
2010-08-28 02:45:28 +01:00
Justin Clark-Casey (justincc) 83fbf66444 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-08-28 02:41:00 +01:00
Justin Clark-Casey (justincc) def6b1544f very minor log message and var name tweaking for iar saving 2010-08-28 02:40:21 +01:00
Diva Canto 0f95cd209e Addresses mantis #4991 -- HG between two regions with the same map coordinates fails with no warning 2010-08-27 17:25:04 -07:00
Justin Clark-Casey (justincc) 1c0b4457cd Improve liveness by operating on list copies of SOG.Children where appropriate 2010-08-28 00:40:33 +01:00